pyrox.dev
freshBootstrapTools.bootstrapTools: fix by using bashNonInteractive
https://hydra.nixos.org/build/289942887/nixlog/1/tail
This gets it back after PR #379368
authored by
Reno Dakota
and committed by
Vladimír Čunát
bd4cd0ae
746c76aa
+3
-3
pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
+3
-3
pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
···
1
{
2
lib,
3
stdenv,
4
-
bash,
5
bzip2,
6
coreutils,
7
cpio,
···
131
cp ${getBin coreutils_}/bin/* $out/bin
132
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
133
134
-
cp -d ${getBin bash}/bin/{ba,}sh $out/bin
135
cp -d ${getBin diffutils}/bin/* $out/bin
136
cp ${getBin findutils}/bin/{find,xargs} $out/bin
137
cp -d ${getBin gawk}/bin/{g,}awk $out/bin
···
192
193
# tools needed to unpack bootstrap archive
194
mkdir -p unpack/bin unpack/lib
195
-
cp -d ${getBin bash}/bin/{bash,sh} unpack/bin
196
cp ${getBin coreutils_}/bin/mkdir unpack/bin
197
cp ${getBin gnutar}/bin/tar unpack/bin
198
cp ${getBin xz}/bin/xz unpack/bin
···
1
{
2
lib,
3
stdenv,
4
+
bashNonInteractive,
5
bzip2,
6
coreutils,
7
cpio,
···
131
cp ${getBin coreutils_}/bin/* $out/bin
132
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
133
134
+
cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin
135
cp -d ${getBin diffutils}/bin/* $out/bin
136
cp ${getBin findutils}/bin/{find,xargs} $out/bin
137
cp -d ${getBin gawk}/bin/{g,}awk $out/bin
···
192
193
# tools needed to unpack bootstrap archive
194
mkdir -p unpack/bin unpack/lib
195
+
cp -d ${getBin bashNonInteractive}/bin/{ba,}sh unpack/bin
196
cp ${getBin coreutils_}/bin/mkdir unpack/bin
197
cp ${getBin gnutar}/bin/tar unpack/bin
198
cp ${getBin xz}/bin/xz unpack/bin