From 4aa52039a77a0f92ffd02c0da1dbae968693ca5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 13 Dec 2012 23:02:22 +0100
Subject: [PATCH] guix-package: Avoid use of the `guix' sub-directory for
profiles.
* guix-package.in (%current-profile): Change to `guix-profile'.
---
guix-package.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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" \
"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."
--
GitLab