From a020d2a996b1d420088f2a6e92f173b950434eba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Dec 2012 22:53:05 +0100 Subject: guix-package: Use directory names from (guix config). * guix-package.in (%profile-directory): Use %STATE-DIRECTORY instead of a hard-coded directory. --- guix-package.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix-package.in') diff --git a/guix-package.in b/guix-package.in index ff7f38383e..dbd2ee24c7 100644 --- a/guix-package.in +++ b/guix-package.in @@ -35,6 +35,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix config) #:use-module (ice-9 ftw) #:use-module (ice-9 format) #:use-module (ice-9 match) @@ -61,8 +62,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ (cut string-append <> "/.guix-profile"))) (define %profile-directory - (string-append "/nix/var/nix/profiles/" - "guix/" + (string-append %state-directory "/profiles/" (or (and=> (getenv "USER") (cut string-append "per-user/" <>)) "default"))) -- cgit 1.4.1 From 4aa52039a77a0f92ffd02c0da1dbae968693ca5f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Dec 2012 23:02:22 +0100 Subject: 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(-) (limited to 'guix-package.in') 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." -- cgit 1.4.1