JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39794 from obsidiansystems/ios-examples

Browse Source 
lib, openssl: 2 misc bits towards iOS support
This commit is contained in:
John Ericson 2018-05-01 01:37:03 -04:00 committed by GitHub
commit d350a444b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/systems/examples.nix
View File

@ -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 = {};
};

2
pkgs/development/libraries/openssl/default.nix
View File

@ -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}"
);