diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-14T13·51+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-14T13·51+0000 |
| commit | 9530cc31700f68fd229eee69eabd2baa099f404a (patch) | |
| tree | 5cc317adeb0c8098d8a9197a0bcbcb29ee4d941d /src/libmain | |
| parent | a7b94e87d7d28f763a708876cba46c8f2484b526 (diff) | |
* Start move towards SHA-256 hashes instead of MD5.
* Start cleaning up unique store path generation (they weren't always
unique; in particular the suffix ("-aterm-2.2", "-builder.sh") was
not part of the hash, therefore changes to the suffix would cause
multiple store objects with the same hash).
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/shared.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index f608afd84898..40750779c531 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -69,10 +69,10 @@ static void initAndRun(int argc, char * * argv) } /* Setup Nix paths. */ - nixStore = getEnv("NIX_STORE_DIR", canonPath(NIX_STORE_DIR)); - nixDataDir = getEnv("NIX_DATA_DIR", canonPath(NIX_DATA_DIR)); - nixLogDir = getEnv("NIX_LOG_DIR", canonPath(NIX_LOG_DIR)); - nixStateDir = getEnv("NIX_STATE_DIR", canonPath(NIX_STATE_DIR)); + nixStore = canonPath(getEnv("NIX_STORE_DIR", 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)); nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db"); /* Check that the store directory and its parent are not |