forked from mirrors/nixpkgs
mesa: 12.0.1 -> 13.0.1
This commit is contained in:
parent
e675b2c0de
commit
a0fa2eca17
|
@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
|
||||||
else
|
else
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "12.0.3";
|
version = "13.0.1";
|
||||||
branch = head (splitString "." version);
|
branch = head (splitString "." version);
|
||||||
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
||||||
in
|
in
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||||
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
|
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1";
|
sha256 = "0cd7axwihwsay0i9fvcw14cldbxyvf8b8rd5sh53plvppyr2z5ki";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = "patchShebangs .";
|
prePatch = "patchShebangs .";
|
||||||
|
@ -51,11 +51,7 @@ stdenv.mkDerivation {
|
||||||
patches = [
|
patches = [
|
||||||
./glx_ro_text_segm.patch # fix for grsecurity/PaX
|
./glx_ro_text_segm.patch # fix for grsecurity/PaX
|
||||||
./symlink-drivers.patch
|
./symlink-drivers.patch
|
||||||
] ++ optional stdenv.isLinux
|
];
|
||||||
(substituteAll {
|
|
||||||
src = ./dlopen-absolute-paths.diff;
|
|
||||||
libudev = systemd.lib;
|
|
||||||
});
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/egl/main/egldriver.c \
|
substituteInPlace src/egl/main/egldriver.c \
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
diff --git a/loader.c b/loader.c
|
|
||||||
index 4fdf3c2..69ea22d 100644
|
|
||||||
--- a/src/loader/loader.c
|
|
||||||
+++ b/src/loader/loader.c
|
|
||||||
@@ -112,7 +112,7 @@ static void *udev_handle = NULL;
|
|
||||||
static void *
|
|
||||||
udev_dlopen_handle(void)
|
|
||||||
{
|
|
||||||
- char name[80];
|
|
||||||
+ char name[256];
|
|
||||||
unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
|
|
||||||
int version;
|
|
||||||
|
|
||||||
@@ -126,7 +126,7 @@ udev_dlopen_handle(void)
|
|
||||||
/* First try opening an already linked libudev, then try loading one */
|
|
||||||
do {
|
|
||||||
for (version = 1; version >= 0; version--) {
|
|
||||||
- snprintf(name, sizeof(name), "libudev.so.%d", version);
|
|
||||||
+ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version);
|
|
||||||
udev_handle = dlopen(name, flags);
|
|
||||||
if (udev_handle)
|
|
||||||
return udev_handle;
|
|
Loading…
Reference in a new issue