From cd3ded43015f09c84990dd0dcae4cfd114387410 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Dec 2012 23:48:21 +0100 Subject: 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. --- guix/store.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index d1621e4504..9aafb332dc 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -111,7 +111,8 @@ (define-enumerate-type hash-algo (sha1 2) (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 (string-append %nix-state-dir "/daemon-socket/socket")) @@ -437,7 +438,8 @@ (define-operation (add-indirect-root (string file-name)) (define %store-prefix ;; 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) "Return #t if PATH is a store path." -- cgit v1.2.3