diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 13:25:46 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 13:25:46 +0000 |
| commit | 21666526b901e3655fd5bdd85546166412d2302e (patch) | |
| tree | 5c7527e687eb4cf9ba049b9d184db4a0853cc5ca /pkgs/development/mobile/titaniumenv/build-app.nix | |
| parent | 29a53017a41ee0390e3b6028aadf303d04103fb7 (diff) | |
| download | nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar.gz nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar.bz2 nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar.lz nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar.xz nixlib-21666526b901e3655fd5bdd85546166412d2302e.tar.zst nixlib-21666526b901e3655fd5bdd85546166412d2302e.zip | |
titaniumsdk: fix to make it work with new android SDK and NPM packages + add titaniumsdk version 5.2
Diffstat (limited to 'pkgs/development/mobile/titaniumenv/build-app.nix')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index fb25037e167d..cafe329c0767 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}: +{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" @@ -47,7 +47,7 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' export HOME=$TMPDIR @@ -78,10 +78,9 @@ stdenv.mkDerivation { javac -version ''} - 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.sdk ${androidsdkComposition}/libexec - export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH + export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out'' |