diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T00·16+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T00·16+0000 |
| commit | 48cea0d01ef48733ab38a73a20611f63aeb1b5cc (patch) | |
| tree | fec81ee5b47b14d6a58ee0b0e86458072efbda4a /src | |
| parent | 93e71e6ab68d9662441289a02448c47069beeb2a (diff) | |
* Refactoring: Get rid of a few subdirectories in corepkgs/, and some
other simplifications. * Use <nix/...> to locate the corepkgs. This allows them to be overriden through $NIX_PATH. * Use bash's pipefail option in the NAR builder so that we don't need to create a temporary file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nix-env/user-env.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 670052bcbb6d..0dcdcc0d186f 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -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. */ |