From 0c3efb9ba05828822ba61105aead64ee3d6dd12c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:13:44 -0400 Subject: [PATCH 1/2] openssl: Support iOS cross compilation (in theory) --- pkgs/development/libraries/openssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a9052222cb..1eac225387d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,6 +48,8 @@ let then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" + else if hostPlatform.isiOS + then "./Configure ios${toString hostPlatform.parsed.cpu.bits}-cross" else throw "Not sure what configuration to use for ${hostPlatform.config}" ); From 9a845de873dfcc31f360a08f1b1f786c6f649c7d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 01:14:58 -0400 Subject: [PATCH 2/2] lib/systems: Update iOS examples The commented-out configs are @shlevy's old known-good ones. I changed them as needed to play nice with lib.systems.parse but did not test so leaving them as comments for now. --- lib/systems/examples.nix | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0..e229cccb365 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -88,16 +88,36 @@ rec { # iphone64 = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; + config = "aarch64-apple-ios"; + # config = "aarch64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; platform = {}; }; iphone32 = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; + config = "armv7-apple-ios"; + # config = "arm-apple-darwin10"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone64-simulator = { + config = "x86_64-apple-ios"; + # config = "x86_64-apple-darwin14"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; + platform = {}; + }; + + iphone32-simulator = { + config = "i686-apple-ios"; + # config = "i386-apple-darwin11"; + sdkVer = "10.2"; + useiOSPrebuilt = true; + isiPhoneSimulator = true; platform = {}; };