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

Merge pull request #10162 from wkennington/master.mesa

Browse Source 
Major update mesa and bump llvm forward
This commit is contained in:
William A. Kennington III 2015-10-02 12:33:03 -07:00
commit a27ca029ee
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ else
*/ */
let let
version = "10.6.8"; version = "11.0.2";
# this is the default search path for DRI drivers # this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in in
@ -36,7 +36,7 @@ stdenv.mkDerivation {
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
]; ];
sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd"; sha256 = "fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";

3
pkgs/top-level/all-packages.nix
View File

@ -4148,7 +4148,7 @@ let
llvm_34 = llvmPackages_34.llvm; llvm_34 = llvmPackages_34.llvm;
llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { }; llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
llvmPackages = recurseIntoAttrs llvmPackages_36; llvmPackages = recurseIntoAttrs llvmPackages_37;
llvmPackagesSelf = llvmPackages_34.override { llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv; stdenv = libcxxStdenv;
@ -7555,7 +7555,6 @@ let
# makes it slower, but during runtime we link against just mesa_drivers # makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity # through /run/opengl-driver*, which is overriden according to config.grsecurity
grsecEnabled = true; grsecEnabled = true;
llvmPackages = llvmPackages_36;
}); });
mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
mesa_drivers = mesaDarwinOr ( mesa_drivers = mesaDarwinOr (