From 6f0c6e20e03bc82fcf0d2198cf81fa2cf25c2f6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Mar 2015 11:15:45 +0100 Subject: Don't rely on __noChroot for corepkgs 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. --- src/libexpr/primops.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 9d18dc54ebcd..9723cdfd247b 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -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 ? -- cgit 1.4.1