diff options
| author | Vladimir Still <vl.still@gmail.com> | 2014-11-28 17:46:39 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:56:15 +0100 |
| commit | f9c96df1d5d8cf6db264c41cb2de227636381203 (patch) | |
| tree | 82662979bb181e092d175aabca8f4dee2a5b5bac /pkgs | |
| parent | 650226e3c433d9db439ad57e9dc52d2077aaea46 (diff) | |
| download | nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar.gz nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar.bz2 nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar.lz nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar.xz nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.tar.zst nixlib-f9c96df1d5d8cf6db264c41cb2de227636381203.zip | |
libc++abi: Fix importing includes from libc++.
And add myself to maintainers. Close #5167.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libc++abi/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 68db6a5dc6c1..cbfe8e8f6659 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { postUnpack = '' unpackFile ${libcxx.src} + cp -r libcxx-*/include libcxxabi*/ '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin # Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't @@ -44,7 +45,7 @@ stdenv.mkDerivation { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; platforms = stdenv.lib.platforms.unix; }; } |