diff options
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 90db53ae7ebd..52268b9c3432 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "10.6.8"; + version = "11.0.2"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd"; + sha256 = "fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaee17dbd31d..52f70e97af17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4148,7 +4148,7 @@ let llvm_34 = llvmPackages_34.llvm; llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { }; - llvmPackages = recurseIntoAttrs llvmPackages_36; + llvmPackages = recurseIntoAttrs llvmPackages_37; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -7555,7 +7555,6 @@ let # 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; - llvmPackages = llvmPackages_36; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( |