From e70dcf681801fb01d4edc7407f4121e2abf5567d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 20 Jan 2017 14:10:15 -0500 Subject: [PATCH] ios-cross: Bump sdk version, verify sdk install at build time --- pkgs/os-specific/darwin/ios-cross/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 1d26a8b350b..01753a5300b 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -18,7 +18,9 @@ { prefix, arch, simulator ? false }: let sdkType = if simulator then "Simulator" else "OS"; - sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; + sdkVer = "10.2"; + + sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk"; /* TODO: Properly integrate with gcc-cross-wrapper */ wrapper = import ../../../build-support/cc-wrapper { @@ -29,6 +31,10 @@ libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; cc = clang; extraBuildCommands = '' + if ! [ -d ${sdk} ]; then + echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2 + exit 1 + fi # ugh tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags