diff options
Diffstat (limited to 'pkgs/development/libraries/libc++/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libc++/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index bed95311915..32035709d8f 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,28 +1,31 @@ -{ stdenv, fetchsvn, cmake }: +{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }: -let rev = "165151"; in +let + version = "3.4.2"; -stdenv.mkDerivation { - name = "libc++-pre${rev}"; +in stdenv.mkDerivation rec { + name = "libc++-${version}"; - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; - inherit rev; - sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz"; + src = fetchurl { + url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz"; + sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2"; }; - buildInputs = [ cmake ]; + buildInputs = [ cmake libcxxabi python ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_CXX_ABI=libcxxabi" ]; enableParallelBuilding = true; + passthru.abi = libcxxabi; + meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = "BSD"; maintainers = stdenv.lib.maintainers.shlevy; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } - |