diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:33:03 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:33:03 -0700 |
| commit | a27ca029ee2b39e04d7d2a516a7228f4b62067fb (patch) | |
| tree | 1e09c5731f2fd123591425b04e26c44afaf5e1e2 /pkgs/top-level | |
| parent | d1047f7c12bb8097007fc644ea4bebcecbb1b934 (diff) | |
| parent | 3e96b763d2458537e994a23478f5ce4257930f31 (diff) | |
| download | nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar.gz nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar.bz2 nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar.lz nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar.xz nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.tar.zst nixlib-a27ca029ee2b39e04d7d2a516a7228f4b62067fb.zip | |
Merge pull request #10162 from wkennington/master.mesa
Major update mesa and bump llvm forward
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
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 ( |