diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-25 21:53:22 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-03 15:20:54 -0500 |
| commit | 010d2f4aa29448b1908b954006484cfbbf7e7d50 (patch) | |
| tree | 846ddf12ec2abc2dcd421a4994feebcc53edb9a1 | |
| parent | 036cef94733d2af03f3732eb8673cf0744303972 (diff) | |
| download | nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar.gz nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar.bz2 nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar.lz nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar.xz nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.tar.zst nixpkgs-010d2f4aa29448b1908b954006484cfbbf7e7d50.zip | |
lib/systems: use newer ios sdk
| -rw-r--r-- | lib/systems/examples.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 585156c2475..f20b37dbb7a 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -164,8 +164,8 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -174,8 +174,8 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -184,8 +184,8 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; @@ -194,8 +194,8 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 3b60ccb64fd..282afe13c34 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -53,5 +53,5 @@ in lib.makeExtensible (self: { xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "8.2")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}"; }) |