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/config.scm.in | |
| parent | 021a201f2967e5a5afdabb03148f225f94c58403 (diff) | |
| download | gnu-guix-80d0447c9556f06decc80a2d43c2fa8402406d91.tar gnu-guix-80d0447c9556f06decc80a2d43c2fa8402406d91.tar.gz | |
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/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 4835c6e5d9..0833faef40 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +55,7 @@ (define %state-directory ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. - "@guix_localstatedir@/nix") + (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/nix")) (define %config-directory ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. |