nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2014-01-08 21:37:06 +01:00
parent 80d0447c95
commit 1d6816f98c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/config.scm.in
View File

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

3
guix/store.scm
View File

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