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

ios-cross: Bump sdk version, verify sdk install at build time

Browse Source
This commit is contained in:
Shea Levy 2017-01-20 14:10:15 -05:00
parent 00ab8e84c6
commit e70dcf6818
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/darwin/ios-cross/default.nix
View File

@ -18,7 +18,9 @@
{ prefix, arch, simulator ? false }: let { prefix, arch, simulator ? false }: let
sdkType = if simulator then "Simulator" else "OS"; 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 */ /* TODO: Properly integrate with gcc-cross-wrapper */
wrapper = import ../../../build-support/cc-wrapper { wrapper = import ../../../build-support/cc-wrapper {
@ -29,6 +31,10 @@
libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
cc = clang; cc = clang;
extraBuildCommands = '' extraBuildCommands = ''
if ! [ -d ${sdk} ]; then
echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2
exit 1
fi
# ugh # ugh
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags mv cc-cflags.tmp $out/nix-support/cc-cflags