diff --git a/pkgs/development/tools/misc/patchelf/0.9.nix b/pkgs/development/tools/misc/patchelf/0.9.nix new file mode 100644 index 000000000000..c64d722ca711 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/0.9.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, patchelf }: + +stdenv.mkDerivation rec { + name = "patchelf-0.9"; + + src = fetchurl { + url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; + }; + + setupHook = [ ./setup-hook.sh ]; + + doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 + + inherit (patchelf) meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f05a18f90514..581d1d376458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10817,6 +10817,7 @@ in parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); @@ -13798,7 +13799,13 @@ in llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; - }; + } + # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145 + // { drivers = (mesa.overrideAttrs (a: { + nativeBuildInputs = [ patchelf_0_9 ] ++ a.nativeBuildInputs or []; + })).drivers; + } + ; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices;