From ece4c62d4b3f6f53935ece6b9cd5efe644cee79b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Mar 2018 17:03:40 -0600 Subject: [PATCH] make-bootstrap-tools: preserve coreutils symlinks We go out of our way (see top of file) to build a single binary with symlinks for all of the tools, but were losing them when preparing the bootstrap tools. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 8033d47d5db5..5522bc5dea25 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -88,7 +88,7 @@ in with pkgs; rec { '' else throw "unsupported libc for bootstrap tools") + '' # Copy coreutils, bash, etc. - cp ${coreutilsMinimal.out}/bin/* $out/bin + cp -d ${coreutilsMinimal.out}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) cp ${bash.out}/bin/bash $out/bin