swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

mesa: fold override of patchelf inside whole build

Browse source 
Overriding it just for .drivers had the advantage of limiting rebuilds,
but it seems less clean and apparently it can interact a bit surprisingly
with some other overrides.  /cc #94444.
Also this will get removed once patchelf gets updated.
This commit is contained in:
Vladimír Čunát 2020-08-04 21:49:34 +02:00
parent 01c2ba8575
commit 9febe2f8fc
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/mesa/default.nix
View file

@ -4,6 +4,7 @@
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, python3Packages , libelf, libvdpau, python3Packages
, libglvnd , libglvnd
, patchelf, autoreconfHook, fetchFromGitHub
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? ["auto"] , galliumDrivers ? ["auto"]
, driDrivers ? ["auto"] , driDrivers ? ["auto"]
@ -126,6 +127,16 @@ stdenv.mkDerivation {
depsBuildBuild = [ pkgconfig ]; depsBuildBuild = [ pkgconfig ];
nativeBuildInputs = [ 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 ];
}))
] ++ [
pkgconfig meson ninja pkgconfig meson ninja
intltool bison flex file intltool bison flex file
python3Packages.python python3Packages.Mako python3Packages.python python3Packages.Mako

18
pkgs/top-level/all-packages.nix
View file

@ -14035,23 +14035,7 @@ in
llvmPackages = llvmPackages_9; llvmPackages = llvmPackages_9;
inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin; inherit (darwin.apple_sdk.libs) Xplugin;
} };
# Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145
// { drivers = (mesa.overrideAttrs (a: {
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;
}
;
mesa_glu = callPackage ../development/libraries/mesa-glu { mesa_glu = callPackage ../development/libraries/mesa-glu {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;