diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-11 11:45:23 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-11 22:54:48 -0500 |
commit | b5d529d52f956a9830d2aa3b1042071216c30d86 (patch) | |
tree | 93bb8ba45379c24663f9d136f5a64e8e8aa9617f /pkgs/development/tools/xcbuild/wrapper.nix | |
parent | 0edb441a0ee44bea1bf448653d2b11679fdcd287 (diff) | |
download | nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar.gz nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar.bz2 nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar.lz nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar.xz nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.tar.zst nixlib-b5d529d52f956a9830d2aa3b1042071216c30d86.zip |
xcbuild: cleanup
Diffstat (limited to 'pkgs/development/tools/xcbuild/wrapper.nix')
-rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 64bf78d0cfbe..d2044ea40ad2 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,5 @@ -{ lib, buildPackages, makeWrapper, writeText, runCommand +{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +, bash , CoreServices, ImageIO, CoreGraphics , targetPlatform , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX" @@ -36,7 +37,7 @@ let ''; xcode-select = writeText "xcode-select" '' -#!/usr/bin/env sh +#!${bash}/bin/sh while [ $# -gt 0 ]; do case "$1" in -h | --help) ;; # noop @@ -51,7 +52,7 @@ done ''; xcrun = writeText "xcrun" '' -#!/usr/bin/env sh +#!${bash}/bin/sh while [ $# -gt 0 ]; do case "$1" in --sdk | -sdk) shift ;; @@ -86,16 +87,20 @@ runCommand "xcodebuild-${xcbuild.version}" { inherit (xcbuild) meta; # ensure that the toolchain goes in PATH - propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain/usr" ]; + propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain" ]; - passthru = { inherit xcbuild; }; + passthru = { + inherit xcbuild; + toolchain = "${toolchains}/XcodeDefault.xctoolchain"; + sdk = "${sdks}/${sdkName}"; + platform = "${platforms}/${xcodePlatform}.platform"; + }; preferLocalBuild = true; } '' mkdir -p $out/bin - mkdir -p $out/usr - ln -s $out/bin $out/usr/bin + ln -s $out $out/usr mkdir -p $out/Library/Xcode ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications @@ -108,7 +113,8 @@ runCommand "xcodebuild-${xcbuild.version}" { --add-flags "DERIVED_DATA_DIR=." \ --set DEVELOPER_DIR "$out" \ --set SDKROOT ${sdkName} \ - --run '[ "$1" = "-version" ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' + --run '[ "$1" = "-version" ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ + --run '[ "$1" = "-license" ] && exit 0' substitute ${xcode-select} $out/bin/xcode-select \ --subst-var-by DEVELOPER_DIR $out |