public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #30196: mesa: 17.1.10 -> 17.2.2

Browse Source
This commit is contained in:
Vladimír Čunát 2017-10-08 18:22:49 +02:00
commit 0df6a8fbe3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/mesa/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, lib { stdenv, fetchurl, fetchpatch, lib
, pkgconfig, intltool, autoreconfHook, substituteAll , pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, openssl , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva , llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau, valgrind-light , libelf, libvdpau, valgrind-light, python2
, grsecEnabled ? false , grsecEnabled ? false
, enableRadv ? false , enableRadv ? true
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
# It's overridden for mesa_drivers. # It's overridden for mesa_drivers.
, enableTextureFloats ? false , enableTextureFloats ? false
@ -67,7 +67,7 @@ let
in in
let let
version = "17.1.10"; version = "17.2.2";
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
@ -82,7 +82,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 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"; sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -150,9 +150,9 @@ stdenv.mkDerivation {
expat llvmPackages.llvm expat llvmPackages.llvm
glproto dri2proto dri3proto presentproto glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence 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*/ libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light valgrind-light python2
]; ];