diff options
| author | rnhmjoj <micheleguerinirocco@me.com> | 2016-11-04 00:05:52 +0100 |
|---|---|---|
| committer | rnhmjoj <micheleguerinirocco@me.com> | 2016-11-04 00:05:52 +0100 |
| commit | 9665fa4fd036faf7c2a67ef758428709a2bea7f8 (patch) | |
| tree | b18f23ff68c753c5fb503ba382e7f38fa98a066d | |
| parent | e675b2c0deb24aabbefbfe342945c20cab616bfb (diff) | |
| download | nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar.gz nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar.bz2 nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar.lz nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar.xz nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.tar.zst nixlib-9665fa4fd036faf7c2a67ef758428709a2bea7f8.zip | |
mesa: 12.0.1 -> 13.0.0
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/dlopen-absolute-paths.diff | 22 |
2 files changed, 3 insertions, 29 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5ff884fd3c1d..3475a5997eaf 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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 \ diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff deleted file mode 100644 index 9a5226572239..000000000000 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ /dev/null @@ -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; |