diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index cdf4a673cc5..9e34360909f 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,7 +1,7 @@ {stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper -, ibtool}: +, xib2nib}: let @@ -91,7 +91,7 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding - ln -s ${ibtool}/bin/ibtool + ln -s ${xib2nib}/bin/ibtool '' + # No point including the entire gcc closure if we don't already have it (if stdenv.cc.isClang then '' diff --git a/pkgs/development/tools/ibtool/default.nix b/pkgs/development/tools/xib2nib/default.nix similarity index 100% rename from pkgs/development/tools/ibtool/default.nix rename to pkgs/development/tools/xib2nib/default.nix diff --git a/pkgs/development/tools/ibtool/nsplist.nix b/pkgs/development/tools/xib2nib/nsplist.nix similarity index 100% rename from pkgs/development/tools/ibtool/nsplist.nix rename to pkgs/development/tools/xib2nib/nsplist.nix diff --git a/pkgs/development/tools/ibtool/plist-cpp.nix b/pkgs/development/tools/xib2nib/plist-cpp.nix similarity index 100% rename from pkgs/development/tools/ibtool/plist-cpp.nix rename to pkgs/development/tools/xib2nib/plist-cpp.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b50aa463f..e7500292dcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18410,5 +18410,5 @@ with pkgs; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; - ibtool = callPackage ../development/tools/ibtool {}; + xib2nib = callPackage ../development/tools/xib2nib {}; }