From fd89f97be97d4f698efd208140062a3f701ef76e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Mar 2015 11:50:22 +0100
Subject: Add the closure of store paths to the chroot

Thus, for example, to get /bin/sh in a chroot, you only need to
specify /bin/sh=${pkgs.bash}/bin/sh in build-chroot-dirs. The
dependencies of sh will be added automatically.
---
 release.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index c5f700d8e776..47ba1c1c3e8d 100644
--- a/release.nix
+++ b/release.nix
@@ -95,11 +95,10 @@ let
 
         # Provide a default value for the ‘build-chroot-dirs’ setting
         # that includes /bin/sh pointing to bash.
-        preHook = lib.optionalString stdenv.isLinux (
-          let sh = stdenv.shell; in
+        preHook = lib.optionalString stdenv.isLinux
           ''
-            export DEFAULT_CHROOT_DIRS="/bin/sh=${sh} $(tr '\n' ' ' < ${writeReferencesToFile sh})"
-          '');
+            export DEFAULT_CHROOT_DIRS="/bin/sh=${stdenv.shell}"
+          '';
 
         enableParallelBuilding = true;
 
-- 
cgit 1.4.1