From 776c827842ac50b39205674a9e2469d42e87024e Mon Sep 17 00:00:00 2001 From: Ryan Artecona Date: Wed, 23 Mar 2016 09:13:00 -0400 Subject: [PATCH] otool: remove The `otool` binary is provided by the `cctools` package (and `binutils`) on darwin, which is properly packaged and compiled from source. This old standalone `otool` was simply a symlink to `/usr/bin/otool`, which notably depended on the user having already installed the Command Line Tools via XCode, and would fail dependent builds if they hadn't. --- pkgs/os-specific/darwin/otool/default.nix | 39 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/os-specific/darwin/otool/default.nix diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix deleted file mode 100644 index 671e51542d06..000000000000 --- a/pkgs/os-specific/darwin/otool/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; -/* this tool only exists on darwin - NOTE: it might make sense to compile this from source (maybe it even works for non-darwin) - I see cctools source is under GPL2+ as well as APSL 2.0 - http://opensource.apple.com/release/developer-tools-46/ -*/ - -stdenv.mkDerivation { - name = "otool"; - - src = "/usr/bin/otool"; - - unpackPhase = "true"; - configurePhase = "true"; - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out/bin" - ln -s $src "$out/bin" - ''; - - meta = with stdenv.lib; { - description = "Object file displaying tool"; - homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; - license = with licenses; [ apsl20 gpl2Plus ]; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.darwin; - - longDescription = '' - The otool command displays specified parts of object files or libraries. - If the, -m option is not used, the file arguments may be of the form - libx.a(foo.o), to request information about only that object file and not - the entire library. - ''; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa31c10745ed..20a1bb31ed7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -633,8 +633,6 @@ let lastpass-cli = callPackage ../tools/security/lastpass-cli { }; - otool = callPackage ../os-specific/darwin/otool { }; - pass = callPackage ../tools/security/pass { }; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };