about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-01-28T13·19+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-01-28T13·19+0000
commit22cfdfa2460921a282fc924cce5fb26378b9fc9d (patch)
tree42f8719fcbc018d7f9a3a259d6e1b1856c4b4cd7
parent9ab0bc9395e8e9af453b649142c98242bb890ac8 (diff)
* Use NIX_STORE environment variable to locate the store (in addition
  to NIX_STORE_DIR) so that Nix invocations in builders in `make
  check' work correctly if the store doesn't exist.

-rw-r--r--src/libmain/shared.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index b032b255951e..395d9c8b4cd6 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -69,7 +69,7 @@ static void initAndRun(int argc, char * * argv)
     }
     
     /* Setup Nix paths. */
-    nixStore = canonPath(getEnv("NIX_STORE_DIR", NIX_STORE_DIR));
+    nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR)));
     nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR));
     nixLogDir = canonPath(getEnv("NIX_LOG_DIR", NIX_LOG_DIR));
     nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR));