lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Add the Nix corepkgs to the end of the search path. This makes it

Browse source 
possible for other Nix expressions to use corepkgs (mostly useful
  for the buildenv function).
This commit is contained in:
Eelco Dolstra 2011-08-06 18:23:38 +00:00
parent c7101dac0b
commit 07340b8be7
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -186,6 +186,8 @@ EvalState::EvalState()
searchPathInsertionPoint = searchPath.end(); searchPathInsertionPoint = searchPath.end();
Strings paths = tokenizeString(getEnv("NIX_PATH", ""), ":"); Strings paths = tokenizeString(getEnv("NIX_PATH", ""), ":");
foreach (Strings::iterator, i, paths) addToSearchPath(*i); foreach (Strings::iterator, i, paths) addToSearchPath(*i);
printMsg(lvlError, nixDataDir);
addToSearchPath("nix=" + nixDataDir + "/nix/corepkgs");
searchPathInsertionPoint = searchPath.begin(); searchPathInsertionPoint = searchPath.begin();
} }

4
tests/lang/eval-okay-search-path.nix
View file

@ -1,3 +1,3 @@
assert builtins.pathExists <nix/buildenv>;
import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix> import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix>

2
tests/lang/eval-okay-search-path.out
View file

@ -1 +1 @@
"abc" "abcc"