summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-02-08 17:24:17 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-02-08 17:24:17 +0100
commite78351cf3a4829c9eecb43af3acba0f82c07513b (patch)
tree325c23e14d65350de2f7d94fe16db9de67fa1ba6 /pkgs/top-level/all-packages.nix
parent979473a17b5026e9f972dc02fb2b47272bfb0bc0 (diff)
downloadnixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar.gz
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar.bz2
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar.lz
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar.xz
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.tar.zst
nixlib-e78351cf3a4829c9eecb43af3acba0f82c07513b.zip
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).
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57a1933c7b26..1332cadc6461 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;