summaryrefslogtreecommitdiff
path: root/guix/config.scm.in
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-01-08 21:37:06 +0100
committerLudovic Courtès <ludo@gnu.org>2014-01-08 21:37:06 +0100
commit1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 (patch)
treeb5693684d13599d9aeb4392b3107f4cc10214b24 /guix/config.scm.in
parent80d0447c9556f06decc80a2d43c2fa8402406d91 (diff)
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.
Diffstat (limited to 'guix/config.scm.in')
-rw-r--r--guix/config.scm.in3
1 files changed, 2 insertions, 1 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'.