From db4f96b3cb817d8f16ad32235f4d75e43d677ab8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 May 2018 12:57:07 -0400 Subject: [PATCH] lib/systems: Fix eval for iphone32* examples Whoops messed up 9a845de873dfcc31f360a08f1b1f786c6f649c7d slightly. --- lib/systems/examples.nix | 2 +- pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index e229cccb365c..fdb120ebb5cb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -96,7 +96,7 @@ rec { }; iphone32 = { - config = "armv7-apple-ios"; + config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; sdkVer = "10.2"; useiOSPrebuilt = true; diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix index 5b9f30b62c39..f336b14ee37b 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix @@ -13,7 +13,7 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "arm" = "armv7"; + "armv7a" = "armv7"; "aarch64" = "arm64"; "x86_64" = "x86_64"; }.${parsed.cpu.name};