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

store: Honor $NIX_STORE_DIR and $NIX_STATE_DIR. 

* guix/store.scm (%nix-state-dir): Honor $NIX_STATE_DIR.
  (%store-prefix): Honor $NIX_STORE_DIR.
master
Ludovic Courtès 2012-12-04 23:48:21 +01:00
parent 860a6f1ae0
commit cd3ded4301
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/store.scm
View File

@ -111,7 +111,8 @@
(sha1 2) (sha1 2)
(sha256 3)) (sha256 3))
(define %nix-state-dir "/nix/var/nix") (define %nix-state-dir
(or (getenv "NIX_STATE_DIR") "/nix/var/nix"))
(define %default-socket-path (define %default-socket-path
(string-append %nix-state-dir "/daemon-socket/socket")) (string-append %nix-state-dir "/daemon-socket/socket"))
@ -437,7 +438,8 @@ file name. Return #t on success."
(define %store-prefix (define %store-prefix
;; Absolute path to the Nix store. ;; Absolute path to the Nix store.
(make-parameter "/nix/store")) (make-parameter (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path)
"/nix/store")))
(define (store-path? path) (define (store-path? path)
"Return #t if PATH is a store path." "Return #t if PATH is a store path."