stdenv-bootstrap-tools: coreutils might miss bin/runcon
This fixes the build, tested nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-unknown-linux-gnu.test https://hydra.nixos.org/build/319154291/nixlog/8/tail https://github.com/NixOS/nixpkgs/pull/460517#issuecomment-3779280430
This commit is contained in:
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Copy coreutils, bash, etc.
|
||||
cp ${getBin coreutils_}/bin/* $out/bin
|
||||
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
|
||||
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk shuf who whoami shred users && rm -f runcon)
|
||||
|
||||
cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin
|
||||
cp -d ${getBin diffutils}/bin/* $out/bin
|
||||
|
||||
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ ''
|
||||
# Copy coreutils, bash, etc.
|
||||
cp -d ${coreutilsMinimal.out}/bin/* $out/bin
|
||||
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
|
||||
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk shuf who whoami shred users && rm -f runcon)
|
||||
|
||||
cp ${bashNonInteractive.out}/bin/bash $out/bin
|
||||
cp ${findutils.out}/bin/find $out/bin
|
||||
|
||||
Reference in New Issue
Block a user