~ruther/guix-local: config: '%store-directory' always honors $NIX_STORE_DIR.

1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 — Ludovic Courtès 12 years ago 80d0447

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.

patch browse .tar.gz

2 files changed, 3 insertions(+), 3 deletions(-)

M guix/config.scm.in
M guix/store.scm

M guix/config.scm.in => guix/config.scm.in +2 -1

@@ 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'.

M guix/store.scm => guix/store.scm +1 -2

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