diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 21:37:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 21:37:06 +0100 |
| commit | 1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 (patch) | |
| tree | b5693684d13599d9aeb4392b3107f4cc10214b24 | |
| parent | 80d0447c9556f06decc80a2d43c2fa8402406d91 (diff) | |
| download | gnu-guix-1d6816f98ca1746f0b627a6dee9c0adbbf7533c4.tar gnu-guix-1d6816f98ca1746f0b627a6dee9c0adbbf7533c4.tar.gz | |
config: '%store-directory' always honors $NIX_STORE_DIR.
* guix/config.scm.in (%store-directory): Honor $NIX_STORE_DIR.
* guix/store.scm (%store-prefix): Use %store-directory directly.
| -rw-r--r-- | guix/config.scm.in | 3 | ||||
| -rw-r--r-- | guix/store.scm | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 0833faef40..3a5c50e00a 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -51,7 +51,8 @@ "@PACKAGE_URL@") (define %store-directory - "@storedir@") + (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path) + "@storedir@")) (define %state-directory ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. diff --git a/guix/store.scm b/guix/store.scm index 7715a15644..1012480b39 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -701,8 +701,7 @@ is true." (define %store-prefix ;; Absolute path to the Nix store. - (make-parameter (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path) - %store-directory))) + (make-parameter %store-directory)) (define (store-path? path) "Return #t if PATH is a store path." |