From b300dddae1a9b1b80ec933ef8574766eb35fcb00 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Aug 2018 13:14:05 -0500 Subject: [PATCH] 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. --- pkgs/development/tools/xcbuild/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \