mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 14:48:25 +03:00
mesa: use upstream patch to fix doCheck again
This commit is contained in:
parent
e368ca20c9
commit
5c01205bf7
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll
|
||||||
, python, libxml2Python, file, expat, makedepend
|
, python, libxml2Python, file, expat, makedepend
|
||||||
, libdrm, xorg, wayland, udev, llvm, libffi
|
, libdrm, xorg, wayland, udev, llvm, libffi
|
||||||
, libvdpau, libelf
|
, libvdpau, libelf
|
||||||
@ -45,6 +45,12 @@ stdenv.mkDerivation {
|
|||||||
./glx_ro_text_segm.patch # fix for grsecurity/PaX
|
./glx_ro_text_segm.patch # fix for grsecurity/PaX
|
||||||
# TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
|
# TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
|
||||||
# as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
|
# as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-lp_test_arit.diff";
|
||||||
|
url = "http://cgit.freedesktop.org/mesa/mesa/patch/"
|
||||||
|
+ "?id=8148a06b8fdb734f7f9a11ce787ee6505939fdaa";
|
||||||
|
sha256 = "0k2bnl7d28nx2y88jchw6jj4f3xfdjjvz4vpvhc40060c2iz8fla";
|
||||||
|
})
|
||||||
] ++ optional stdenv.isLinux
|
] ++ optional stdenv.isLinux
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./dlopen-absolute-paths.diff;
|
src = ./dlopen-absolute-paths.diff;
|
||||||
@ -103,7 +109,7 @@ stdenv.mkDerivation {
|
|||||||
;
|
;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
#doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
|
doCheck = true;
|
||||||
|
|
||||||
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
|
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
|
||||||
# also move libOSMesa to $osmesa, as it's relatively big
|
# also move libOSMesa to $osmesa, as it's relatively big
|
||||||
|
Loading…
Reference in New Issue
Block a user