diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-08 18:22:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-08 18:22:49 +0200 |
| commit | 0df6a8fbe3cea204beab4080e005db250445737e (patch) | |
| tree | cf3e64fb971d6696d4444d91f3985c8e4c4c243e /pkgs/development/libraries/mesa | |
| parent | 4003e775f4e135733df422991376ba6b1a6ccfab (diff) | |
| parent | e16d95b6867bed6768602427f58837113c8cefd6 (diff) | |
| download | nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar.gz nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar.bz2 nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar.lz nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar.xz nixlib-0df6a8fbe3cea204beab4080e005db250445737e.tar.zst nixlib-0df6a8fbe3cea204beab4080e005db250445737e.zip | |
Merge #30196: mesa: 17.1.10 -> 17.2.2
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 96d226785cab..16a03652d833 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, openssl +, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva -, libelf, libvdpau, valgrind-light +, libelf, libvdpau, valgrind-light, python2 , grsecEnabled ? false -, enableRadv ? false +, enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. # It's overridden for mesa_drivers. , enableTextureFloats ? false @@ -67,7 +67,7 @@ let in let - version = "17.1.10"; + version = "17.2.2"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,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 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"; + sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; }; prePatch = "patchShebangs ."; @@ -150,9 +150,9 @@ stdenv.mkDerivation { expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf libXvMC + libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light + valgrind-light python2 ]; |