about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-05-06 15:53:06 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-05-06 15:53:06 +0200
commit0a897b2a33dd920456b058de9f835aa890a67cd9 (patch)
treecc28843ab39cf78378a0d2525036cba4d36e3719 /pkgs/top-level
parente68633cd7270b01c6a02196054335090d6c13455 (diff)
downloadnixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar.gz
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar.bz2
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar.lz
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar.xz
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.tar.zst
nixlib-0a897b2a33dd920456b058de9f835aa890a67cd9.zip
mesa: use older LLVM on aarch64 for now
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6e65cee66e4..c59497d4be38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9139,12 +9139,16 @@ with pkgs;
       inherit (darwin) apple_sdk;
     }
     else alternative;
+
   mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
     # 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_4;
+
+    # llvm-4.0.0 won't pass tests on aarch64
+    llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4;
   });
+
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
   mesa_drivers = mesaDarwinOr (
     let mo = mesa_noglu.override {