Commit e22d0b49 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

patchelf: use 0.13.x on aarch64+musl 

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.
parent 3838a0a7

pkgs/development/tools/misc/patchelf/0.13.nix

+5 −0
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/all-packages.nix

+8 −2
Original line number Diff line number Diff line
@@ -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 { });