diff options
| -rw-r--r-- | pkgs/development/tools/xcbuild/toolchain.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/ibtool/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 4313f005147..cdf4a673cc5 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,6 +1,7 @@ {stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper +, ibtool}: let @@ -89,6 +90,8 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/pagestuff ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding + + ln -s ${ibtool}/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/os-specific/darwin/ibtool/default.nix b/pkgs/os-specific/darwin/ibtool/default.nix new file mode 100644 index 00000000000..556426ac62d --- /dev/null +++ b/pkgs/os-specific/darwin/ibtool/default.nix @@ -0,0 +1,20 @@ +{ stdenv }: + +assert stdenv.isDarwin; + +stdenv.mkDerivation { + name = "ibtool"; + src = "/usr/bin/ibtool"; + + unpackPhase = "true"; + dontBuild = true; + + installPhase = '' + mkdir -p "$out"/bin + ln -s "$src" "$out"/bin + ''; + + meta = with stdenv.lib; { + platforms = platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca033e4ffdc..30f6598f975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18407,4 +18407,6 @@ with pkgs; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; + + ibtool = callPackage ../os-specific/darwin/ibtool {}; } |