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/buildenv.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'corepkgs/buildenv.nix')

diff --git a/corepkgs/buildenv.nix b/corepkgs/buildenv.nix
index c52a0ea93d35..5bf7b4e56042 100644
--- a/corepkgs/buildenv.nix
+++ b/corepkgs/buildenv.nix
@@ -23,6 +23,5 @@ derivation {
   # network traffic, so don't do that.
   preferLocalBuild = true;
 
-  # Don't build in a chroot because Nix's dependencies may not be there.
-  __noChroot = true;
+  inherit chrootDeps;
 }
-- 
cgit 1.4.1