Skip to content
Snippets Groups Projects
Commit 53f974fd authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

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

* guix-package.in (%profile-directory): Use %STATE-DIRECTORY instead of
  a hard-coded directory.
parent 8e1cd713
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ ...@@ -35,6 +35,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix config)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (ice-9 match) #:use-module (ice-9 match)
...@@ -61,8 +62,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \ ...@@ -61,8 +62,7 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
(cut string-append <> "/.guix-profile"))) (cut string-append <> "/.guix-profile")))
(define %profile-directory (define %profile-directory
(string-append "/nix/var/nix/profiles/" (string-append %state-directory "/profiles/"
"guix/"
(or (and=> (getenv "USER") (or (and=> (getenv "USER")
(cut string-append "per-user/" <>)) (cut string-append "per-user/" <>))
"default"))) "default")))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment