maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't rely on __noChroot for corepkgs

Browse source 
This doesn't work anymore if the "strict" chroot mode is
enabled. Instead, add Nix's store path as a dependency. This ensures
that its closure is present in the chroot.
This commit is contained in:
Eelco Dolstra 2015-03-24 11:15:45 +01:00
parent b005e63ccf
commit 6f0c6e20e0
6 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -1507,12 +1507,15 @@ void EvalState::createBaseEnv()
mkInt(v, time(0));
addConstant("__currentTime", v);
mkString(v, settings.thisSystem.c_str());
mkString(v, settings.thisSystem);
addConstant("__currentSystem", v);
mkString(v, nixVersion.c_str());
mkString(v, nixVersion);
addConstant("__nixVersion", v);
mkString(v, settings.nixStore);
addConstant("__storeDir", v);
/* Language version. This should be increased every time a new
language feature gets added. It's not necessary to increase it
when primops get added, because you can just use `builtins ?