From 58857196f10eb0553ad00e10d7cc6340b92f5d3a Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Sat, 14 Jan 2023 10:07:44 +0000 Subject: [PATCH] stdenv: mark binutils-patchelfed (#209600) The stdenv bootstrap creates several wrappers around binutils, and gives them the exact same drvName as the binutils package itself. These wrappers cost almost nothing to create (they are just file copies and patchelf runs, not builds), so we should distinguish them from expensive binutils builds with a unique pname. This commit does that. --- pkgs/stdenv/linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 870fb04c388..3b42753ddae 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -332,7 +332,8 @@ in # and that can fail to load. Therefore we upgrade `ld` to use newer libc; # apparently the interpreter needs to match libc, too. bintools = self.stdenvNoCC.mkDerivation { - inherit (prevStage.bintools.bintools) name; + pname = prevStage.bintools.bintools.pname + "-patchelfed-ld"; + inherit (prevStage.bintools.bintools) version; enableParallelBuilding = true; dontUnpack = true; dontBuild = true;