From 1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 8 Jan 2014 21:37:06 +0100
Subject: 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.
---
 guix/store.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'guix/store.scm')

diff --git a/guix/store.scm b/guix/store.scm
index 7715a15644..1012480b39 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -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."
-- 
cgit v1.2.3