diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 0d38e2466b0..b0ae8dd6e8e 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -21,7 +21,9 @@ xcbuildInstallPhase () { if [ -z "$dontUseXcbuild" ]; then buildPhase=xcbuildBuildPhase - installPhase=xcbuildInstallPhase + if [ -z "$installPhase" ]; then + installPhase=xcbuildInstallPhase + fi fi # if [ -d "*.xcodeproj" ]; then diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index e5600f3962d..7857a59161c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -8,12 +8,25 @@ stdenv.mkDerivation { sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; }; + # remove pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" ''; + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + + for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois + do + install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + done + ''; + buildInputs = [ xcbuild libcxx ]; + + # temporary fix for iostream issue NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = {