diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-21 20:50:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 20:50:20 +0100 |
| commit | 82de183455b5a50c35be8cdae1cc888d9711c943 (patch) | |
| tree | f6e02103845808fb62e9a5b09174a5f8969cecc4 /pkgs | |
| parent | 1d479088792e8a5999c4ffcb747653a53c1e78fe (diff) | |
| parent | 6377391d68bbbee3d9171eaf5d205e9125a0aed8 (diff) | |
| download | nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar.gz nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar.bz2 nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar.lz nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar.xz nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.tar.zst nixlib-82de183455b5a50c35be8cdae1cc888d9711c943.zip | |
Merge pull request #34088 from LnL7/xcbuild-platform-version
xcbuild: platform version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/xcbuild/sdk.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/tools/xcbuild/wrapper.nix | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 169fd5f6ec66..87bbedd57880 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,26 +1,30 @@ { stdenv, writeText, toolchainName, sdkName, xcbuild }: let + # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. + version = "10.10"; SDKSettings = { CanonicalName = sdkName; DisplayName = sdkName; Toolchains = [ toolchainName ]; - Version = "10.10"; - MaximumDeploymentTarget = "10.10"; + Version = version; + MaximumDeploymentTarget = version; isBaseSDK = "YES"; }; SystemVersion = { ProductName = "Mac OS X"; - ProductVersion = "10.10"; + ProductVersion = version; }; - in stdenv.mkDerivation { - name = "MacOSX.sdk"; + name = "MacOSX${version}.sdk"; + inherit version; + buildInputs = [ xcbuild ]; + buildCommand = '' mkdir -p $out/ plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2f6b42e7a00e..3a1547440fd6 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation { - name = "xcbuild-wrapper"; + name = "xcbuild-wrapper-${xcbuild.version}"; buildInputs = [ xcbuild makeWrapper ]; |