diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2018-01-05 12:34:03 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2018-01-05 12:34:03 +0100 |
| commit | fb346c34023bc30f43ac14e7d7da25be48dcf4f4 (patch) | |
| tree | 46cf3911f853ee88d79023b09f8e90639825b250 /pkgs/development/mobile/titaniumenv/build-app.nix | |
| parent | bb06428818afeb006992b5e72302812835251e24 (diff) | |
| download | nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar.gz nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar.bz2 nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar.lz nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar.xz nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.tar.zst nixpkgs-fb346c34023bc30f43ac14e7d7da25be48dcf4f4.zip | |
titaniumenv: upgrade to 6.3 and remove deprecated old versions
Diffstat (limited to 'pkgs/development/mobile/titaniumenv/build-app.nix')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0c9c3e3f42c..96ffaa00f9a 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -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 +{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: +{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2" +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -47,9 +47,11 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' + ${preBuild} + export HOME=$TMPDIR ${stdenv.lib.optionalString (tiVersion != null) '' @@ -77,9 +79,9 @@ stdenv.mkDerivation { export JAVA_HOME=${javaVersionFixWrapper} javac -version ''} - - titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec - + + titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec + export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH ${if release then |