wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

* Refactoring: Get rid of a few subdirectories in corepkgs/, and some

Browse source 
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.
This commit is contained in:
Eelco Dolstra 2012-01-03 00:16:29 +00:00
parent 93e71e6ab6
commit 48cea0d01e
15 changed files with 52 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix-env/user-env.cc
View file

@ -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. */