public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc++abi: Drop dependency on libunwind

Browse Source 
This appears no longer needed (libc++abi has its own libunwind). It
also prevents every libc++ user from depending on liblzma.
This commit is contained in:
Eelco Dolstra 2014-10-11 22:30:41 +02:00
parent 3ac28c3645
commit 34f6e629b5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libc++abi/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libcxx, libunwind, coreutils, gnused }: { lib, stdenv, fetchurl, libcxx, coreutils, gnused }:
let rev = "199626"; in let rev = "199626"; in
@ -19,9 +19,6 @@ stdenv.mkDerivation {
export NIX_CFLAGS_COMPILE="-I$PWD/include -I$(readlink -f libcxx-*)/include" export NIX_CFLAGS_COMPILE="-I$PWD/include -I$(readlink -f libcxx-*)/include"
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin export TRIPLE=x86_64-apple-darwin
'' + lib.optionalString (!stdenv.isDarwin) ''
export NIX_CFLAGS_COMPILE+=" -I${libunwind}/include"
export NIX_CFLAGS_LINK+=" -L${libunwind}/lib -lunwind"
''; '';
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin