* Sync with the trunk.

2012-01-03 12:59:31 +00:00
parent 502d94048a 63227d434c
commit 6c31232e14
35 changed files with 241 additions and 242 deletions
@@ -112,7 +112,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,

    /* Get the environment builder expression. */
    Value envBuilder;
-    state.evalFile(nixDataDir + "/nix/corepkgs/buildenv", envBuilder);
+    state.evalFile(state.findFile("nix/buildenv.nix"), envBuilder);

    /* Construct a Nix expression that calls the user environment
       builder with the manifest as argument. */