diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /guix-package.in | |
parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
download | guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
Diffstat (limited to 'guix-package.in')
-rw-r--r-- | guix-package.in | 4 |
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." |