diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-29 19:58:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-29 19:58:09 +0200 |
| commit | 250c7682e1c971b4c265ed181ad6857549947157 (patch) | |
| tree | 63e6b284cec6d649efab9c0f3ca2eb1f1c69429f /pkgs/stdenv/darwin | |
| parent | ee7a54df0c8ef74bb6387488a8735f7730b75ceb (diff) | |
| download | nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar.gz nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar.bz2 nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar.lz nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar.xz nixlib-250c7682e1c971b4c265ed181ad6857549947157.tar.zst nixlib-250c7682e1c971b4c265ed181ad6857549947157.zip | |
Remove broken libunwindNative package
Copying /usr/lib/system/libunwind.dylib at evaluation time doesn't work (e.g. on Hydra). And copying binary system libraries is a bad idea anyway for license reasons.
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 08d9e713494a..787180cbe3a4 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -28,12 +28,7 @@ import ../generic rec { nativeTools = false; nativeLibc = true; inherit stdenv; - extraPackages = - stdenv.lib.optional haveLibCxx (pkgs.libcxx.override { - libcxxabi = pkgs.libcxxabi.override { - libunwind = pkgs.libunwindNative; - }; - }); + extraPackages = stdenv.lib.optional haveLibCxx pkgs.libcxx; binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;}; clang = if useClang33 then pkgs.clang_33.clang else pkgs.clang.clang; coreutils = pkgs.coreutils; |