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

Merge #91157: mesa.drivers: build with patchelf 0.9

Browse Source
This commit is contained in:
Vladimír Čunát 2020-06-20 15:47:38 +02:00
commit b59fbf76d2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/misc/patchelf/0.9.nix Normal file
View File

@ -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;
}

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

@ -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;