xcodeenv: make it work with Xcode 8.2.1

This commit is contained in:
Sander van der Burg
2017-01-25 16:56:55 +01:00
parent ca7923f111
commit 0f6eab52e1
8 changed files with 11 additions and 18 deletions
@@ -1,7 +1,7 @@
{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}:
{ name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "9.2"
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2"
, enableWirelessDistribution ? false, installURL ? null
}:
@@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}:
{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}:
rec {
androidenv = pkgs.androidenv;
@@ -1,10 +1,10 @@
{ nixpkgs ? <nixpkgs>
, systems ? [ "x86_64-linux" "x86_64-darwin" ]
, xcodeVersion ? "7.2"
, xcodeVersion ? "8.2.1"
, xcodeBaseDir ? "/Applications/Xcode.app"
, tiVersion ? "6.0.2.GA"
, rename ? false
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2"
, enableWirelessDistribution ? false, installURL ? null
}:
@@ -3,5 +3,5 @@
xcodeenv.simulateApp {
name = "simulate-${kitchensink.name}";
inherit bundleId;
app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator";
app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator";
}