diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-16 13:38:30 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-16 13:38:30 +0300 |
| commit | 424e5ca7c99f5a4c08f8480bc3be395181ec827a (patch) | |
| tree | d611b7b45d85a053586494243680e5555d484c5c /pkgs/development/tools/xcbuild | |
| parent | 488cc85dcf455ed5a0ae0952fe458e36d3c4057d (diff) | |
| download | nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar.gz nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar.bz2 nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar.lz nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar.xz nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.tar.zst nixpkgs-424e5ca7c99f5a4c08f8480bc3be395181ec827a.zip | |
xcbuild: add ProductBuildVersion
Diffstat (limited to 'pkgs/development/tools/xcbuild')
| -rw-r--r-- | pkgs/development/tools/xcbuild/sdks.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index e1b8254d7fd..bf16bf132d7 100644 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ b/pkgs/development/tools/xcbuild/sdks.nix @@ -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 diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 35eddd40f85..9c8c846e5cc 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -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 { |