From bb45092f72d173a7754f7e4a6457d44c748a893b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Aug 2014 17:07:28 +0200 Subject: Make chroot builds easier to set up By default, we now include /bin/sh as a bind-mount of bash. --- release.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 1f91e23b5d..c439257925 100644 --- a/release.nix +++ b/release.nix @@ -93,6 +93,14 @@ let --sysconfdir=/etc ''; + # 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 + '' + NIX_CFLAGS_COMPILE+=" -DDEFAULT_CHROOT_DIRS=\"/bin/sh=${sh}:$(tr '\n' ':' < ${writeReferencesToFile sh})\"" + ''); + enableParallelBuilding = true; makeFlags = "profiledir=$(out)/etc/profile.d"; -- cgit 1.4.1