From 22cfdfa2460921a282fc924cce5fb26378b9fc9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Jan 2005 13:19:16 +0000 Subject: [PATCH] * 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. --- src/libmain/shared.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index b032b2559..395d9c8b4 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));