summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-13 23:02:22 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-13 23:02:22 +0100
commit4aa52039a77a0f92ffd02c0da1dbae968693ca5f (patch)
treef0ef4c34c4a07f64e58f8a69cb2bb5d8e296e549
parent6cb3ccf835e0f10438e5ffd9c888c09e3d5d1380 (diff)
downloadguix-4aa52039a77a0f92ffd02c0da1dbae968693ca5f.tar.gz
guix-package: Avoid use of the `guix' sub-directory for profiles.
* guix-package.in (%current-profile): Change to `guix-profile'.
-rw-r--r--guix-package.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix-package.in b/guix-package.in
index dbd2ee24c7..fee1a39b2f 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -68,7 +68,9 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0"    \
                      "default")))
 
 (define %current-profile
-  (string-append %profile-directory "/profile"))
+  ;; Call it `guix-profile', not `profile', to allow Guix profiles to
+  ;; coexist with Nix profiles.
+  (string-append %profile-directory "/guix-profile"))
 
 (define (profile-manifest profile)
   "Return the PROFILE's manifest."