From a78af29ae7e7d2d0c0737271cfdb0ff710493e1d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 9 Apr 2017 04:22:44 -0500 Subject: [PATCH] install_name_tool: remove cctools provides install_name_tool --- .../darwin/install_name_tool/default.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix deleted file mode 100644 index 581eb31cc71..00000000000 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "install_name_tool"; - src = "/usr/bin/install_name_tool"; - - unpackPhase = "true"; - dontBuild = true; - - installPhase = '' - mkdir -p "$out"/bin - ln -s "$src" "$out"/bin - ''; - - meta = with stdenv.lib; { - description = "Change dynamic shared library install names"; - homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.darwin; - - longDescription = '' - Install_name_tool changes the dynamic shared library install names and or - adds, changes or deletes the rpaths recorded in a Mach-O binary. - ''; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0ef39ce64f..ca033e4ffdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -547,8 +547,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; - install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8fd95ea65d7..266f11a73ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28918,8 +28918,7 @@ EOF }; propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; + buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps preConfigure = ''