dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

patchelf: use 0.13.x on aarch64+musl

Browse Source 
The C++ compiler in our musl bootstrap for aarch64 is too old to build
the latest version of patchelf, so we need to use the latest version
that builds with that compiler to get a new bootstrap.
This commit is contained in:
Alyssa Ross 2022-04-22 09:42:51 +00:00
parent 3838a0a7e7
commit e22d0b49a9
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/misc/patchelf/0.13.nix
View File

@ -1,5 +1,10 @@
{ stdenv, fetchurl, patchelf }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec {
pname = "patchelf";
version = "0.13.1";

10
pkgs/top-level/all-packages.nix
View File

@ -15799,9 +15799,15 @@ with pkgs;
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
patchelf = callPackage ../development/tools/misc/patchelf { };
patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then
patchelf_0_13
else
patchelf_0_14;
patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { };
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { };
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
patchelf = patchelf_0_14;
};
patchelf_0_14 = callPackage ../development/tools/misc/patchelf { };
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });