summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-10-08 12:09:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-10-08 18:24:13 +0200
commit85b77d946e69bd5cedcedc4935e336f4cbc4e556 (patch)
tree79e25ac9790d1452aee3e4a4b4973a3bc1bb0f13 /pkgs/top-level
parent4b66f2f753203ce57c6f9e2e1eaaa5d394d87c25 (diff)
downloadnixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar.gz
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar.bz2
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar.lz
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar.xz
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.tar.zst
nixlib-85b77d946e69bd5cedcedc4935e336f4cbc4e556.zip
mesa: use llvm_5 by default
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8fc79710ad..734552a93ff2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9805,8 +9805,8 @@ with pkgs;
     # through /run/opengl-driver*, which is overriden according to config.grsecurity
     # grsecEnabled = true; # no more support in nixpkgs ATM
 
-    # llvm-4.0.0 won't pass tests on aarch64
-    llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4;
+    # llvm-4.0.0 and 5.0.0 won't pass tests on aarch64
+    llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_5;
   });
 
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });