Unverified Commit b55a4988 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #226446 from wegank/xcbuild-product-build 

xcbuild: add ProductBuildVersion
parents 2058d8f8 424e5ca7

pkgs/development/tools/xcbuild/sdks.nix

+7 −5
Original line number Diff line number Diff line 
{ runCommand, lib, toolchainName, sdkName

, writeText, version, xcodePlatform }:

, writeText, xcodePlatform, sdkVer, productBuildVer }:



let

  inherit (lib.generators) toPlist toJSON;
@@ -8,14 +8,16 @@ let 
    CanonicalName = sdkName;

    DisplayName = sdkName;

    Toolchains = [ toolchainName ];

    Version = version;

    MaximumDeploymentTarget = version;

    Version = sdkVer;

    MaximumDeploymentTarget = sdkVer;

    isBaseSDK = "YES";

  };



  SystemVersion = {

  SystemVersion = lib.optionalAttrs (productBuildVer != null) {

    ProductBuildVersion = productBuildVer;

  } // {

    ProductName = "Mac OS X";

    ProductVersion = version;

    ProductVersion = sdkVer;

  };

in

pkgs/development/tools/xcbuild/wrapper.nix

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
, CoreServices, ImageIO, CoreGraphics

, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"

, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"

, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" }:

, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12"

, productBuildVer ? null

}:



let
@@ -23,8 +25,7 @@ let 
  };



  sdks = callPackage ./sdks.nix {

    inherit toolchainName sdkName xcodePlatform;

    version = sdkVer;

    inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer;

  };



  platforms = callPackage ./platforms.nix {