diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-20 13:14:05 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-20 13:16:37 -0500 |
| commit | b300dddae1a9b1b80ec933ef8574766eb35fcb00 (patch) | |
| tree | 68b6820cd090a604ef8963114011486b9f1a5c46 /pkgs/development/tools/xcbuild | |
| parent | cfa4e0ac149b186a8fc965814c3cac5b2e74459c (diff) | |
| download | nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar.gz nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar.bz2 nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar.lz nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar.xz nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.tar.zst nixpkgs-b300dddae1a9b1b80ec933ef8574766eb35fcb00.zip | |
xcbuild: only override version with 1 arg
sometimes we want the "SDK" version from xcbuild so we do something like: $ xcbuild -version -sdk MacOSX10.10 SDKSettings.plist - MacOSX10.10 (MacOSX10.10) SDKVersion: 10.10 Path: /nix/store/6k7crm1n4drf09ga0dwvbmb59x4zl2i2-SDKs/MacOSX10.10.sdk PlatformPath: /nix/store/vhfwb1znfy65s2xs27j8xribk6mp6lbw-Platforms/MacOSX.platform ProductName: Mac OS X ProductVersion: 10.10 This was previously overriden by the current xcode version so you would get: Xcode 9.4.1 Build version 17E189 This should fix the other usage of -version in nodejs 6.x.
Diffstat (limited to 'pkgs/development/tools/xcbuild')
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 1735124439e..4aa08f99457 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -112,7 +112,7 @@ 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" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ --run '[ "$1" = "-license" ] && exit 0' substitute ${xcode-select} $out/bin/xcode-select \ |