From 0a897b2a33dd920456b058de9f835aa890a67cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 6 May 2017 15:53:06 +0200 Subject: [PATCH] mesa: use older LLVM on aarch64 for now --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 {