From 1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <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/config.scm.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'guix/config.scm.in')

diff --git a/guix/config.scm.in b/guix/config.scm.in
index 0833faef40..3a5c50e00a 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -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'.
-- 
cgit v1.2.3