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. --- corepkgs/unpack-channel.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'corepkgs/unpack-channel.nix') diff --git a/corepkgs/unpack-channel.nix b/corepkgs/unpack-channel.nix index f7c5210354..9445532ded 100644 --- a/corepkgs/unpack-channel.nix +++ b/corepkgs/unpack-channel.nix @@ -37,6 +37,5 @@ derivation { # No point in doing this remotely. preferLocalBuild = true; - # Don't build in a chroot because Nix's dependencies may not be there. - __noChroot = true; + inherit chrootDeps; } -- cgit 1.4.1