mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity

Merge pull request #20139 from rnhmjoj/mesa

Browse source 
mesa: 12.0.1 -> 13.0.0
This commit is contained in:
Tim Steinbach 2016-11-04 09:21:47 -04:00 committed by GitHub
parent d0ae7b973d 9665fa4fd0
commit 1c6b3bdc35
2 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
else
let
version = "12.0.3";
version = "13.0.0";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@ -40,7 +40,7 @@ stdenv.mkDerivation {
"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"
];
sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1";
sha256 = "09yp4wh89srxqqzsnrqgw4gmx68mgxic5nbrprl6l1l2zzmv9vcl";
};
prePatch = "patchShebangs .";
@ -51,11 +51,7 @@ stdenv.mkDerivation {
patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch
] ++ optional stdenv.isLinux
(substituteAll {
src = ./dlopen-absolute-paths.diff;
libudev = systemd.lib;
});
];
postPatch = ''
substituteInPlace src/egl/main/egldriver.c \

22
pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
View file

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