diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-28 13:19:16 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-28 13:19:16 +0000 |
| commit | 22cfdfa2460921a282fc924cce5fb26378b9fc9d (patch) | |
| tree | 42f8719fcbc018d7f9a3a259d6e1b1856c4b4cd7 /src | |
| parent | 9ab0bc9395e8e9af453b649142c98242bb890ac8 (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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmain/shared.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |