freshBootstrapTools.bootstrapTools: fix by using bashNonInteractive

https://hydra.nixos.org/build/289942887/nixlog/1/tail
This gets it back after PR #379368
This commit is contained in:
Reno Dakota
2025-02-18 20:37:28 +01:00
committed by Vladimír Čunát
parent 746c76aa6f
commit bd4cd0aee8
@@ -1,7 +1,7 @@
{
lib,
stdenv,
bash,
bashNonInteractive,
bzip2,
coreutils,
cpio,
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
cp ${getBin coreutils_}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
cp -d ${getBin bash}/bin/{ba,}sh $out/bin
cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin
cp -d ${getBin diffutils}/bin/* $out/bin
cp ${getBin findutils}/bin/{find,xargs} $out/bin
cp -d ${getBin gawk}/bin/{g,}awk $out/bin
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
# tools needed to unpack bootstrap archive
mkdir -p unpack/bin unpack/lib
cp -d ${getBin bash}/bin/{bash,sh} unpack/bin
cp -d ${getBin bashNonInteractive}/bin/{ba,}sh unpack/bin
cp ${getBin coreutils_}/bin/mkdir unpack/bin
cp ${getBin gnutar}/bin/tar unpack/bin
cp ${getBin xz}/bin/xz unpack/bin