Merge pull request #42467 from mkaito/update-mesa

mesa: 18.0.3 -> 18.1.2
This commit is contained in:
Matthew Bauer 2018-07-05 22:18:21 -04:00 committed by GitHub
commit b29440fd10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -67,7 +67,7 @@ let
in in
let let
version = "18.0.3"; version = "18.1.2";
branch = head (splitString "." version); branch = head (splitString "." version);
in in
@ -81,7 +81,7 @@ let self = 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://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
]; ];
sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; sha256 = "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -154,7 +154,7 @@ let self = stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland wayland-protocols libvdpau libelf libXvMC libffi wayland wayland-protocols libvdpau libelf libXvMC
libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light python2 valgrind-light python2 python2.pkgs.Mako
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;