diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-26 10:56:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 10:56:57 -0400 |
| commit | e4d9ce90611a90d7855dc234fb33e89217cd16ed (patch) | |
| tree | 93f353ae48eb06424a1b008bb1b175eb8bbfb2bc /lib | |
| parent | 9c5b6bb81452f1e09f7c6abd984f9b3042598601 (diff) | |
| parent | 0bfffbc5e19f1a16c19f3cec5272174555006869 (diff) | |
| download | nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar.gz nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar.bz2 nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar.lz nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar.xz nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.tar.zst nixlib-e4d9ce90611a90d7855dc234fb33e89217cd16ed.zip | |
Merge pull request #42599 from obsidiansystems/xcodever-in-system
xcode: add xcodePlatform to system
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/default.nix | 1 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ee4c29660a55..5eacc9eb23e1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -46,7 +46,6 @@ rec { # Misc boolean options useAndroidPrebuilt = false; useiOSPrebuilt = false; - isiPhoneSimulator = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 1817a6380ddd..31772ba0054d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -101,6 +101,7 @@ rec { # config = "aarch64-apple-darwin14"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -110,6 +111,7 @@ rec { # config = "arm-apple-darwin10"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -119,8 +121,8 @@ rec { # config = "x86_64-apple-darwin14"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; @@ -129,8 +131,8 @@ rec { # config = "i386-apple-darwin11"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; |