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

Merge #94532: mesa.drivers: build with patchelf's master

Browse Source
This commit is contained in:
Vladimír Čunát 2020-08-04 21:35:31 +02:00
commit 6a617de2c4
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14046,7 +14046,17 @@ in
} }
# Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145 # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145
// { drivers = (mesa.overrideAttrs (a: { // { drivers = (mesa.overrideAttrs (a: {
nativeBuildInputs = [ patchelf_0_9 ] ++ a.nativeBuildInputs or []; nativeBuildInputs = [
(patchelf.overrideAttrs (pa: {
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "61bc10176"; # current master; what matters is merge of #225
sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93";
};
nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ];
}))
] ++ a.nativeBuildInputs or [];
})).drivers; })).drivers;
} }
; ;