From 07d9b3cded757d1ffa5d1010a6eaefeb4ebf512f Mon Sep 17 00:00:00 2001 From: Jude Taylor <me@jude.bio> Date: Thu, 1 Oct 2015 16:34:37 -0700 Subject: [PATCH] remove obsolete libunwindNative --- pkgs/development/libraries/libunwind/native.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/libunwind/native.nix diff --git a/pkgs/development/libraries/libunwind/native.nix b/pkgs/development/libraries/libunwind/native.nix deleted file mode 100644 index 6ce485ecaec0..000000000000 --- a/pkgs/development/libraries/libunwind/native.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -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; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af8de26af19b..d0bf1a051098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7395,11 +7395,9 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then libunwindNative + then darwin.libunwind else callPackage ../development/libraries/libunwind { }; - libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; - libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { automake = automake113x; # fails with 14 inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;