xcbuild: add ProductBuildVersion
This commit is contained in:
parent
488cc85dcf
commit
424e5ca7c9
2 changed files with 11 additions and 8 deletions
|
@ -1,5 +1,5 @@
|
|||
{ 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
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue