pyrox.dev / nixpkgs
lol
fork atom

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.

Alyssa Ross e22d0b49 3838a0a7

+13 -2
unified split
+5
pkgs/development/tools/misc/patchelf/0.13.nix
··· 1 { stdenv, fetchurl, patchelf }: 2 3 stdenv.mkDerivation rec { 4 pname = "patchelf"; 5 version = "0.13.1";
··· 1 { stdenv, fetchurl, patchelf }: 2 3 + # Note: this package is used for bootstrapping fetchurl, and thus 4 + # cannot use fetchpatch! All mutable patches (generated by GitHub or 5 + # cgit) that are needed here should be included directly in Nixpkgs as 6 + # files. 7 + 8 stdenv.mkDerivation rec { 9 pname = "patchelf"; 10 version = "0.13.1";
+8 -2
pkgs/top-level/all-packages.nix
··· 15799 15800 parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; 15801 15802 - patchelf = callPackage ../development/tools/misc/patchelf { }; 15803 patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; 15804 - patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { }; 15805 15806 patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); 15807
··· 15799 15800 parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; 15801 15802 + patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then 15803 + patchelf_0_13 15804 + else 15805 + patchelf_0_14; 15806 patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; 15807 + patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { 15808 + patchelf = patchelf_0_14; 15809 + }; 15810 + patchelf_0_14 = callPackage ../development/tools/misc/patchelf { }; 15811 15812 patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); 15813