about summary refs log tree commit diff
path: root/corepkgs/nar.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-24T10·15+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-24T10·15+0100
commit6f0c6e20e03bc82fcf0d2198cf81fa2cf25c2f6c (patch)
tree0037f8a7f72bb2c0fd5cb89e8c37c03d1c8c8ebf /corepkgs/nar.nix
parentb005e63ccf387add426aa9941ab9f5770307fe33 (diff)
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.
Diffstat (limited to 'corepkgs/nar.nix')
-rw-r--r--corepkgs/nar.nix5
1 files changed, 2 insertions, 3 deletions
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;
 }