From 34f6e629b59d104c7023f1bf41e679bb4e625609 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 11 Oct 2014 22:30:41 +0200 Subject: [PATCH] libc++abi: Drop dependency on libunwind This appears no longer needed (libc++abi has its own libunwind). It also prevents every libc++ user from depending on liblzma. --- pkgs/development/libraries/libc++abi/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index a12b6e423bc7..d5b8b0fcdcea 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libcxx, libunwind, coreutils, gnused }: +{ lib, stdenv, fetchurl, libcxx, coreutils, gnused }: let rev = "199626"; in @@ -19,9 +19,6 @@ stdenv.mkDerivation { export NIX_CFLAGS_COMPILE="-I$PWD/include -I$(readlink -f libcxx-*)/include" '' + lib.optionalString stdenv.isDarwin '' 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