Author: eelco
Date: Sat Aug 6 18:23:38 2011
New Revision: 28198
URL: https://svn.nixos.org/websvn/nix/?rev=28198&sc=1
Log:
* Add the Nix corepkgs to the end of the search path. This makes it
possible for other Nix expressions to use corepkgs (mostly useful
for the buildenv function).
Modified:
nix/trunk/src/libexpr/eval.cc
nix/trunk/tests/lang/eval-okay-search-path.nix
nix/trunk/tests/lang/eval-okay-search-path.out
Modified: nix/trunk/src/libexpr/eval.cc
==============================================================================
--- nix/trunk/src/libexpr/eval.cc Sat Aug 6 18:01:56 2011 (r28197)
+++ nix/trunk/src/libexpr/eval.cc Sat Aug 6 18:23:38 2011 (r28198)
@@ -186,6 +186,8 @@
searchPathInsertionPoint = searchPath.end();
Strings paths = tokenizeString(getEnv("NIX_PATH", ""), ":");
foreach (Strings::iterator, i, paths) addToSearchPath(*i);
+ printMsg(lvlError, nixDataDir);
+ addToSearchPath("nix=" + nixDataDir + "/nix/corepkgs");
searchPathInsertionPoint = searchPath.begin();
}
Modified: nix/trunk/tests/lang/eval-okay-search-path.nix
==============================================================================
--- nix/trunk/tests/lang/eval-okay-search-path.nix Sat Aug 6 18:01:56
2011 (r28197)
+++ nix/trunk/tests/lang/eval-okay-search-path.nix Sat Aug 6 18:23:38
2011 (r28198)
@@ -1,3 +1,3 @@
-import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix>
-
+assert builtins.pathExists <nix/buildenv>;
+import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix>
Modified: nix/trunk/tests/lang/eval-okay-search-path.out
==============================================================================
--- nix/trunk/tests/lang/eval-okay-search-path.out Sat Aug 6 18:01:56
2011 (r28197)
+++ nix/trunk/tests/lang/eval-okay-search-path.out Sat Aug 6 18:23:38
2011 (r28198)
@@ -1 +1 @@
-"abc"
+"abcc"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
