From bd4cd0aee876c5006f6e36e5f13def9343bb804c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 18 Feb 2025 20:35:43 +0100 Subject: [PATCH] freshBootstrapTools.bootstrapTools: fix by using bashNonInteractive https://hydra.nixos.org/build/289942887/nixlog/1/tail This gets it back after PR #379368 --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c..1dde0a42e4ba 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -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