summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-01-20 20:19:53 -0500
committerShea Levy <shea@shealevy.com>2014-01-20 20:33:06 -0500
commitfea2266290d64b11a3bf02bda8764eb6e3d8b7a1 (patch)
treeb2ab3d7dab2f3bfb8d5b4ee085c10f87893af2ca /pkgs/development/libraries
parent204ec0cd43d12fd56b3a9d28396321cc56da5fd3 (diff)
downloadnixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar.gz
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar.bz2
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar.lz
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar.xz
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.tar.zst
nixlib-fea2266290d64b11a3bf02bda8764eb6e3d8b7a1.zip
llvm: Split llvmFull into separate derivations
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libc++/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index 964d3727f8f2..70da4462486d 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi }:
+{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }:
 
 let
   version = "3.4";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx";
   };
 
-  buildInputs = [ cmake libcxxabi ];
+  buildInputs = [ cmake libcxxabi python ];
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release"
                  "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"