b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

xcbuild: add ProductBuildVersion

Browse source
This commit is contained in:
Weijia Wang 2023-04-16 13:38:30 +03:00
parent 488cc85dcf
commit 424e5ca7c9
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/tools/xcbuild/sdks.nix
View file

@ -1,5 +1,5 @@
{ runCommand, lib, toolchainName, sdkName { runCommand, lib, toolchainName, sdkName
, writeText, version, xcodePlatform }: , writeText, xcodePlatform, sdkVer, productBuildVer }:
let let
inherit (lib.generators) toPlist toJSON; inherit (lib.generators) toPlist toJSON;
@ -8,14 +8,16 @@ let
CanonicalName = sdkName; CanonicalName = sdkName;
DisplayName = sdkName; DisplayName = sdkName;
Toolchains = [ toolchainName ]; Toolchains = [ toolchainName ];
Version = version; Version = sdkVer;
MaximumDeploymentTarget = version; MaximumDeploymentTarget = sdkVer;
isBaseSDK = "YES"; isBaseSDK = "YES";
}; };
SystemVersion = { SystemVersion = lib.optionalAttrs (productBuildVer != null) {
ProductBuildVersion = productBuildVer;
} // {
ProductName = "Mac OS X"; ProductName = "Mac OS X";
ProductVersion = version; ProductVersion = sdkVer;
}; };
in in

7
pkgs/development/tools/xcbuild/wrapper.nix
View file

@ -2,7 +2,9 @@
, CoreServices, ImageIO, CoreGraphics , CoreServices, ImageIO, CoreGraphics
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , 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 let
@ -23,8 +25,7 @@ let
}; };
sdks = callPackage ./sdks.nix { sdks = callPackage ./sdks.nix {
inherit toolchainName sdkName xcodePlatform; inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer;
version = sdkVer;
}; };
platforms = callPackage ./platforms.nix { platforms = callPackage ./platforms.nix {