Skip to content

xcbuild: various improvements #185969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zowoq merged 3 commits into from
Aug 14, 2022
Merged

xcbuild: various improvements #185969

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c67213a
xcbuild: implement additional xcrun flags
stephank Jul 19, 2022
fd73de8
xcbuild: allow using xcrun separately
stephank Aug 10, 2022
285e986
xcbuild: reject invalid xcrun sdk name
stephank Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions pkgs/development/tools/xcbuild/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, makeWrapper, writeText, runCommand
{ lib, stdenv, makeWrapper, writeText, writeShellScriptBin, runCommand
, CoreServices, ImageIO, CoreGraphics
, runtimeShell, callPackage
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
Expand All @@ -9,6 +9,7 @@ let

toolchainName = "com.apple.dt.toolchain.XcodeDefault";
sdkName = "${xcodePlatform}${sdkVer}";
xcrunSdkName = lib.toLower xcodePlatform;

# TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
sdkBuildVersion = "17E189";
Expand Down Expand Up @@ -50,12 +51,27 @@ while [ $# -gt 0 ]; do
done
'';

xcrun = writeText "xcrun" ''
#!${runtimeShell}
xcrun = writeShellScriptBin "xcrun" ''
args=( "$@" )

# If an SDK was requested, check that it matches.
for ((i = 0; i < ''${#args[@]}; i++)); do
case "''${args[i]}" in
--sdk | -sdk)
i=$((i + 1))
if [[ "''${args[i]}" != '${xcrunSdkName}' ]]; then
echo >&2 "xcodebuild: error: SDK \"''${args[i]}\" cannot be located."
exit 1
fi
;;
esac
done

while [ $# -gt 0 ]; do
case "$1" in
--sdk | -sdk) shift ;;
--find | -find)
--toolchain | -toolchain) shift ;;
--find | -find | -f)
shift
command -v $1 ;;
--log | -log) ;; # noop
Expand All @@ -74,6 +90,7 @@ while [ $# -gt 0 ]; do
esac
shift
done

if ! [[ -z "$@" ]]; then
exec "$@"
fi
Expand All @@ -89,7 +106,7 @@ runCommand "xcodebuild-${xcbuild.version}" {
propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain" ];

passthru = {
inherit xcbuild;
inherit xcbuild xcrun;
toolchain = "${toolchains}/XcodeDefault.xctoolchain";
sdk = "${sdks}/${sdkName}";
platform = "${platforms}/${xcodePlatform}.platform";
Expand Down Expand Up @@ -126,8 +143,7 @@ runCommand "xcodebuild-${xcbuild.version}" {
--subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer
chmod +x $out/bin/xcode-select

substitute ${xcrun} $out/bin/xcrun
chmod +x $out/bin/xcrun
cp ${xcrun}/bin/xcrun $out/bin/xcrun

for bin in PlistBuddy actool builtin-copy builtin-copyPlist \
builtin-copyStrings builtin-copyTiff \
Expand Down