ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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 @@ (define %guix-home-page-url
"@PACKAGE_URL@") "@PACKAGE_URL@")
(define %store-directory (define %store-directory
"@storedir@") (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path)
"@storedir@"))
(define %state-directory (define %state-directory
;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.

3
guix/store.scm
View file

@ -701,8 +701,7 @@ (define* (export-paths server paths port #:key (sign? #t))
(define %store-prefix (define %store-prefix
;; Absolute path to the Nix store. ;; Absolute path to the Nix store.
(make-parameter (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path) (make-parameter %store-directory))
%store-directory)))
(define (store-path? path) (define (store-path? path)
"Return #t if PATH is a store path." "Return #t if PATH is a store path."