mirror of
https://github.com/NixOS/nix.git
synced 2024-10-31 14:20:52 +00:00
Make chroot builds easier to set up
By default, we now include /bin/sh as a bind-mount of bash.
This commit is contained in:
parent
7a60ff9a62
commit
bb45092f72
@ -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";
|
||||
|
@ -48,6 +48,9 @@ Settings::Settings()
|
||||
useSubstitutes = true;
|
||||
buildUsersGroup = getuid() == 0 ? "nixbld" : "";
|
||||
useChroot = false;
|
||||
#ifdef DEFAULT_CHROOT_DIRS
|
||||
dirsInChroot = tokenizeString<StringSet>(DEFAULT_CHROOT_DIRS, ":");
|
||||
#endif
|
||||
useSshSubstituter = true;
|
||||
impersonateLinux26 = false;
|
||||
keepLog = true;
|
||||
|
Loading…
Reference in New Issue
Block a user