Merge pull request #38385 from dtzWill/update/mesa-17.3.7

mesa: 17.3.6 -> 17.3.7, use llvm6
This commit is contained in:
Will Dietz 2018-04-03 08:45:31 -05:00 committed by GitHub
commit 9714501256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -67,7 +67,7 @@ let
in
let
version = "17.3.6";
version = "17.3.7";
branch = head (splitString "." version);
in
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8";
sha256 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585";
};
prePatch = "patchShebangs .";

View File

@ -10520,6 +10520,7 @@ with pkgs;
# makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity
# grsecEnabled = true; # no more support in nixpkgs ATM
llvmPackages = llvmPackages_6;
};
mesa_glu = callPackage ../development/libraries/mesa-glu { };