From 6072a289fc946d76649696f1c4e7f024423a767e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 18 Jan 2014 19:02:45 +0100 Subject: [PATCH] llvm: no-rule-aarch64.patch is only needed on 3.3 the fix just missed 3.3 but it's in 3.4 see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625 --- pkgs/development/compilers/llvm/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index d11105576bf..fc5b5ff8d96 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, version }: -with { inherit (stdenv.lib) optional; }; +with { inherit (stdenv.lib) optional optionals; }; assert version == "3.4" || version == "3.3"; @@ -14,11 +14,10 @@ stdenv.mkDerivation rec { else /*3.3*/ "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8"; }; - patches = - # The default rlimits in 3.3 are too low for shared libraries. - optional (version == "3.3") ./more-memory-for-bugpoint.patch - ++ [ ./no-rule-aarch64.patch ] # http://llvm.org/bugs/show_bug.cgi?id=16625 - ; + patches = optionals (version == "3.3") [ + ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries. + ./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625 + ]; # libffi was propagated before, but it wasn't even being used, so # unless something needs it just an input is fine.