tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
xcbuild: add ProductBuildVersion
Weijia Wang
2 years ago
424e5ca7
488cc85d
+11
-8
2 changed files
expand all
collapse all
unified
split
pkgs
development
tools
xcbuild
sdks.nix
wrapper.nix
+7
-5
pkgs/development/tools/xcbuild/sdks.nix
···
1
{ runCommand, lib, toolchainName, sdkName
2
-
, writeText, version, xcodePlatform }:
3
4
let
5
inherit (lib.generators) toPlist toJSON;
···
8
CanonicalName = sdkName;
9
DisplayName = sdkName;
10
Toolchains = [ toolchainName ];
11
-
Version = version;
12
-
MaximumDeploymentTarget = version;
13
isBaseSDK = "YES";
14
};
15
16
-
SystemVersion = {
0
0
17
ProductName = "Mac OS X";
18
-
ProductVersion = version;
19
};
20
in
21
···
1
{ runCommand, lib, toolchainName, sdkName
2
+
, writeText, xcodePlatform, sdkVer, productBuildVer }:
3
4
let
5
inherit (lib.generators) toPlist toJSON;
···
8
CanonicalName = sdkName;
9
DisplayName = sdkName;
10
Toolchains = [ toolchainName ];
11
+
Version = sdkVer;
12
+
MaximumDeploymentTarget = sdkVer;
13
isBaseSDK = "YES";
14
};
15
16
+
SystemVersion = lib.optionalAttrs (productBuildVer != null) {
17
+
ProductBuildVersion = productBuildVer;
18
+
} // {
19
ProductName = "Mac OS X";
20
+
ProductVersion = sdkVer;
21
};
22
in
23
+4
-3
pkgs/development/tools/xcbuild/wrapper.nix
···
2
, CoreServices, ImageIO, CoreGraphics
3
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
4
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
5
-
, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" }:
0
0
6
7
let
8
···
23
};
24
25
sdks = callPackage ./sdks.nix {
26
-
inherit toolchainName sdkName xcodePlatform;
27
-
version = sdkVer;
28
};
29
30
platforms = callPackage ./platforms.nix {
···
2
, CoreServices, ImageIO, CoreGraphics
3
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
4
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
5
+
, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12"
6
+
, productBuildVer ? null
7
+
}:
8
9
let
10
···
25
};
26
27
sdks = callPackage ./sdks.nix {
28
+
inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer;
0
29
};
30
31
platforms = callPackage ./platforms.nix {