From 31e093d3b0ed6702fe682e82916f212f6fb0d440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Jan 2026 17:28:07 +0100 Subject: [PATCH] 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 --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 2 +- pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index 46c463bf4884..2a83899d77cc 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -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 diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix index e4f1ae734205..eb052a915ba2 100644 --- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix @@ -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