diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 23:02:22 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 23:02:22 +0100 |
| commit | 4aa52039a77a0f92ffd02c0da1dbae968693ca5f (patch) | |
| tree | f0ef4c34c4a07f64e58f8a69cb2bb5d8e296e549 | |
| parent | 6cb3ccf835e0f10438e5ffd9c888c09e3d5d1380 (diff) | |
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.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix-package.in b/guix-package.in index dbd2ee24c7b..fee1a39b2fc 100644 --- a/guix-package.in +++ b/guix-package.in | |||
| @@ -68,7 +68,9 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ | |||
| 68 | "default"))) | 68 | "default"))) |
| 69 | 69 | ||
| 70 | (define %current-profile | 70 | (define %current-profile |
| 71 | (string-append %profile-directory "/profile")) | 71 | ;; Call it `guix-profile', not `profile', to allow Guix profiles to |
| 72 | ;; coexist with Nix profiles. | ||
| 73 | (string-append %profile-directory "/guix-profile")) | ||
| 72 | 74 | ||
| 73 | (define (profile-manifest profile) | 75 | (define (profile-manifest profile) |
| 74 | "Return the PROFILE's manifest." | 76 | "Return the PROFILE's manifest." |