tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-04 00:05:56 +02:00
Code Activity

config: '%store-directory' always honors $NIX_STORE_DIR.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
guix/config.scm.in
+2 -1
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'.
guix/store.scm
+1 -2
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."