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

Remove broken libunwindNative package

Browse Source 
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.
This commit is contained in:
Eelco Dolstra 2014-09-29 19:58:09 +02:00
parent ee7a54df0c
commit 250c7682e1
4 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,15 +12,16 @@ stdenv.mkDerivation {
patches = [ ./no-stdc++.patch ./darwin.patch ];
NIX_CFLAGS_LINK = "-L${libunwind}/lib -lunwind";
buildInputs = [ coreutils ];
postUnpack = ''
unpackFile ${libcxx.src}
export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include"
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

15
pkgs/development/libraries/libunwind/native.nix
View File

@ -1,15 +0,0 @@
{ stdenv }:
stdenv.mkDerivation {
name = "libunwind-native";
unpackPhase = ":";
dontBuild = true;
installPhase = ''
mkdir -p $out/lib
cat ${/usr/lib/system/libunwind.dylib} > $out/lib/libunwind.dylib
'';
meta.platforms = stdenv.lib.platforms.darwin;
}

7
pkgs/stdenv/darwin/default.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -5759,8 +5759,6 @@ let
libunwind = callPackage ../development/libraries/libunwind { };
libunwindNative = callPackage ../development/libraries/libunwind/native.nix {};
libuvVersions = callPackage ../development/libraries/libuv { };
libv4l = lowPrio (v4l_utils.override {