diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 21:12:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 21:12:55 +0100 |
| commit | 80d0447c9556f06decc80a2d43c2fa8402406d91 (patch) | |
| tree | 351b4cf1c42641e81274b7eacf70949a0e7e2964 /guix/scripts | |
| parent | 021a201f2967e5a5afdabb03148f225f94c58403 (diff) | |
config: '%state-directory' always honors $NIX_STATE_DIR.
* guix/config.scm.in (%state-directory): Honor $NIX_STATE_DIR.
* guix/scripts/package.scm (%profile-directory): Use %state-directory
directly.
* guix/store.scm (%default-socket-path, log-file): Likewise.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/package.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index c12ddcd8c9..04393abc9a 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -57,7 +57,7 @@ (cut string-append <> "/.guix-profile"))) (define %profile-directory - (string-append (or (getenv "NIX_STATE_DIR") %state-directory) "/profiles/" + (string-append %state-directory "/profiles/" (or (and=> (getenv "USER") (cut string-append "per-user/" <>)) "default"))) |