From 6f0c6e20e03bc82fcf0d2198cf81fa2cf25c2f6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
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/nar.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'corepkgs/nar.nix')

diff --git a/corepkgs/nar.nix b/corepkgs/nar.nix
index 04be17fb0ce2..61b3fc6772c4 100644
--- a/corepkgs/nar.nix
+++ b/corepkgs/nar.nix
@@ -41,9 +41,8 @@ derivation {
   args = [ "-e" builder ];
   inherit storePath hashAlgo compressionType;
 
-  # Don't build in a chroot because Nix's dependencies may not be there.
-  __noChroot = true;
-
   # Remote machines may not have ${nixBinDir} or ${coreutils} in the same prefixes
   preferLocalBuild = true;
+
+  inherit chrootDeps;
 }
-- 
cgit 1.4.1