From 7163babe84d08c892aa6ba6d2bbc1a4c137ba3d8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Jul 2013 10:00:43 +0200
Subject: [PATCH] Revert "Allow specifying packages whose closures should be in
 the chroot"

This reverts commit be3d498b1891339ffceb3f54f749d3d5fa343429.
---
 modules/services/misc/nix-daemon.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index d3acc625a8b..f28a793aefc 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -29,12 +29,10 @@ let
       # other paths in the store, we need the closure of /bin/sh
       # in `build-chroot-dirs' - otherwise any builder that uses
       # /bin/sh won't work.
-      closureFile = pkgs.runCommand "closure" {
-        exportReferencesGraph = concatMap (pkg: [ "closure${baseNameOf pkg}" pkg ]) cfg.chrootClosures;
-      } "cat closure* | sort | uniq > $out";
+      binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
     in
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
-        extraPaths=$(for i in $(cat ${closureFile}); do if test -e $i; then echo $i; fi; done)
+        extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
         cat > $out <<END
         # WARNING: this file is generated.
         build-users-group = nixbld
@@ -97,13 +95,6 @@ in
           '';
       };
 
-      chrootClosures = mkOption {
-        default = [];
-        example = [ config.system.build.binsh pkgs.coreutils ];
-        description = "Packages whose closures should be included in the chroot";
-        type = types.listOf types.package;
-      };
-
       extraOptions = mkOption {
         default = "";
         example = "
@@ -260,8 +251,6 @@ in
 
     nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
 
-    nix.chrootClosures = [ config.system.build.binsh ];
-
     environment.etc."nix/nix.conf".source = nixConf;
 
     # List of machines for distributed Nix builds in the format