diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·34-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·34-0400 |
| commit | 15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc (patch) | |
| tree | 49c0c914a6d3d02f54150bfaba3731aa9b98d720 /src/libexpr/eval.cc | |
| parent | a9e6752bbd888ab8fbc1cda6e4d539b2858c4cef (diff) | |
| parent | 9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1 (diff) | |
Merge branch 'no-manifests'
Diffstat (limited to 'src/libexpr/eval.cc')
| -rw-r--r-- | src/libexpr/eval.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index fadfb3b530e1..c10177223e5a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -181,7 +181,7 @@ EvalState::EvalState() searchPathInsertionPoint = searchPath.end(); Strings paths = tokenizeString(getEnv("NIX_PATH", ""), ":"); foreach (Strings::iterator, i, paths) addToSearchPath(*i); - addToSearchPath("nix=" + nixDataDir + "/nix/corepkgs"); + addToSearchPath("nix=" + settings.nixDataDir + "/nix/corepkgs"); searchPathInsertionPoint = searchPath.begin(); createBaseEnv(); @@ -1091,7 +1091,7 @@ string EvalState::coerceToString(Value & v, PathSet & context, if (srcToStore[path] != "") dstPath = srcToStore[path]; else { - dstPath = readOnlyMode + dstPath = settings.readOnlyMode ? computeStorePathForPath(path).first : store->addToStore(path); srcToStore[path] = dstPath; |