guix-package: Use directory names from (guix config).

* guix-package.in (%profile-directory): Use %STATE-DIRECTORY instead of
  a hard-coded directory.
This commit is contained in:
Ludovic Courtès 2012-12-13 22:53:05 +01:00
parent 8e1cd71376
commit 53f974fd45

View File

@ -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")))