From b205b587e7ab22e5e5763646369ce63ffd2ee150 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 Jan 2016 13:32:21 +0000 Subject: titaniumenv: remove obsolete iosWwdrCertificate parameter --- pkgs/development/mobile/titaniumenv/examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index be2ee419ff4c..02e493a83c55 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -4,7 +4,7 @@ , xcodeBaseDir ? "/Applications/Xcode.app" , tiVersion ? "5.1.1.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2", iosWwdrCertificate ? null +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2" , allowUnfree ? false , enableWirelessDistribution ? false, installURL ? null }: @@ -84,7 +84,7 @@ rec { inherit tiVersion; release = true; rename = true; - inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate; + inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; inherit enableWirelessDistribution installURL; }; } -- cgit 1.4.1 From 4dc36b12270cffc040fc2d862cf1ee15e3f1fa26 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 Jan 2016 14:35:54 +0000 Subject: titaniumenv: use version 5.1.2 by default in the example --- pkgs/development/mobile/titaniumenv/examples/default.nix | 2 +- pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 02e493a83c55..6dd80a216ded 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -2,7 +2,7 @@ , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "7.2" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "5.1.1.GA" +, tiVersion ? "5.1.2.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2" , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index b6c012a77ef0..c2c12438b610 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,4 +1,4 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.1.GA", release ? false +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1" , enableWirelessDistribution ? false, installURL ? null }: -- cgit 1.4.1 From b4e47d1ab8dc887ec57ae42a04822eb45e43bc52 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 Jan 2016 14:39:21 +0000 Subject: titaniumenv: change identifier to 5.1.2.GA --- pkgs/development/mobile/titaniumenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index f1ea4dc2342b..f9bb61ef43a9 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -9,7 +9,7 @@ rec { } else null; titaniumsdk = let - titaniumSdkFile = if tiVersion == "5.1.1.GA" then ./titaniumsdk-5.1.nix + titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { -- cgit 1.4.1 From a1cd11aff45bc66d2fecb46b9cf0023822bc4062 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 Jan 2016 16:19:18 +0000 Subject: titaniumenv: remove obsolete android configuration steps --- pkgs/development/mobile/titaniumenv/build-app.nix | 5 ----- pkgs/development/mobile/titaniumenv/default.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0de6c58e7267..a99ab8d2d795 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -51,11 +51,6 @@ stdenv.mkDerivation { '' titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-* titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1 - titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.path ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-* - titanium config --config-file $TMPDIR/config.json android.executables.zipalign ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/zipalign - titanium config --config-file $TMPDIR/config.json android.executables.aapt ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aapt - titanium config --config-file $TMPDIR/config.json android.executables.aidl ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aidl - titanium config --config-file $TMPDIR/config.json android.executables.dx ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/dx export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index f9bb61ef43a9..579456188d00 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.1.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.2.GA"}: rec { androidenv = pkgs.androidenv; -- cgit 1.4.1