From e78351cf3a4829c9eecb43af3acba0f82c07513b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Feb 2014 17:24:17 +0100 Subject: [PATCH] llvm: revert to _33 default on darwin as a temp workaround _34 doesn't build and I don't have a clue what to do about it (and I don't have a machine to test it anyway). --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57a1933c7b2..1332cadc646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2794,7 +2794,8 @@ let lessc = callPackage ../development/compilers/lessc { }; - llvm = llvmPackages.llvm; + llvm = if stdenv.isDarwin then llvm_33 # until someone solves build problems with _34 + else llvmPackages.llvm; llvm_34 = llvmPackages.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;