diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:53:05 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:53:05 +0100 |
| commit | 53f974fd45ae9fb8401fd541adf25bcfae3c36af (patch) | |
| tree | 6d68a2fd94f54f4479e3b3350b0d81ceceb690aa | |
| parent | 8e1cd713767b7e8266dbf54211d94f687f0301d9 (diff) | |
| download | guix-patches-53f974fd45ae9fb8401fd541adf25bcfae3c36af.tar guix-patches-53f974fd45ae9fb8401fd541adf25bcfae3c36af.tar.gz | |
guix-package: Use directory names from (guix config).
* guix-package.in (%profile-directory): Use %STATE-DIRECTORY instead of
a hard-coded directory.
| -rw-r--r-- | guix-package.in | 4 |
1 files changed, 2 insertions, 2 deletions
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"))) |