xcbuild: add ProductBuildVersion

+11 -8
+7 -5
pkgs/development/tools/xcbuild/sdks.nix
··· 1 1 { runCommand, lib, toolchainName, sdkName 2 - , writeText, version, xcodePlatform }: 2 + , writeText, xcodePlatform, sdkVer, productBuildVer }: 3 3 4 4 let 5 5 inherit (lib.generators) toPlist toJSON; ··· 8 8 CanonicalName = sdkName; 9 9 DisplayName = sdkName; 10 10 Toolchains = [ toolchainName ]; 11 - Version = version; 12 - MaximumDeploymentTarget = version; 11 + Version = sdkVer; 12 + MaximumDeploymentTarget = sdkVer; 13 13 isBaseSDK = "YES"; 14 14 }; 15 15 16 - SystemVersion = { 16 + SystemVersion = lib.optionalAttrs (productBuildVer != null) { 17 + ProductBuildVersion = productBuildVer; 18 + } // { 17 19 ProductName = "Mac OS X"; 18 - ProductVersion = version; 20 + ProductVersion = sdkVer; 19 21 }; 20 22 in 21 23
+4 -3
pkgs/development/tools/xcbuild/wrapper.nix
··· 2 2 , CoreServices, ImageIO, CoreGraphics 3 3 , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" 4 4 , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" 5 - , sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" }: 5 + , sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" 6 + , productBuildVer ? null 7 + }: 6 8 7 9 let 8 10 ··· 23 25 }; 24 26 25 27 sdks = callPackage ./sdks.nix { 26 - inherit toolchainName sdkName xcodePlatform; 27 - version = sdkVer; 28 + inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer; 28 29 }; 29 30 30 31 platforms = callPackage ./platforms.nix {