diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
| commit | adaf64a99b0a882249e35768c3f4fe3de104cbb2 (patch) | |
| tree | 89b3becb5f9197f3d453355262549ea8bf08b9d2 /src/libexpr/eval.cc | |
| parent | 63227d434cefaa9faeb14afe28ebeb9b2d449ee2 (diff) | |
| parent | 9936da6b546d1ce643eca21ac76c6e7d568de1c2 (diff) | |
* Merge the multiple-outputs-sandbox branch (svn merge --reintegrate
^/nix/branches/multiple-outputs-sandbox). Multiple output support still isn't complete, but it wasn't complete in the trunk either, so it doesn't hurt.
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 2b97b76fb776..bba14bc35491 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -148,8 +148,6 @@ EvalState::EvalState() nrAttrsets = nrOpUpdates = nrOpUpdateValuesCopied = 0; deepestStack = (char *) -1; - createBaseEnv(); - allowUnsafeEquality = getEnv("NIX_NO_UNSAFE_EQ", "") == ""; #if HAVE_BOEHMGC @@ -188,6 +186,8 @@ EvalState::EvalState() foreach (Strings::iterator, i, paths) addToSearchPath(*i); addToSearchPath("nix=" + nixDataDir + "/nix/corepkgs"); searchPathInsertionPoint = searchPath.begin(); + + createBaseEnv(); } |