diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-01-14 10:07:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 10:07:44 +0000 |
| commit | 58857196f10eb0553ad00e10d7cc6340b92f5d3a (patch) | |
| tree | 0e429d8fe51c05a71bc89af9d39a722ee7b4750e /pkgs/stdenv/linux | |
| parent | 67a3a14f240c8f2a0175b4af7f905acd57987716 (diff) | |
| download | nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar.gz nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar.bz2 nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar.lz nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar.xz nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.tar.zst nixpkgs-58857196f10eb0553ad00e10d7cc6340b92f5d3a.zip | |
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.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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; |