diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2014-10-14 12:14:05 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2014-10-14 12:14:05 +0200 |
| commit | 3ce9467f49464d505ed5901c04d10f721cf9914b (patch) | |
| tree | 37f93c510ed4ca8d3d9cffe2b4e5aedcba8ef03a /pkgs/development/mobile | |
| parent | 8523d0e44c8d6abcc0da83b1597c584b51b9e3f4 (diff) | |
| download | nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar.gz nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar.bz2 nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar.lz nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar.xz nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.tar.zst nixlib-3ce9467f49464d505ed5901c04d10f721cf9914b.zip | |
titaniumsdk: Fix Titanium SDK 3.1 compatibility with the new Android SDK
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index fa959035a9e9..c99a19ff7749 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -49,6 +49,13 @@ stdenv.mkDerivation { '' titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* + # Add zipalign to PATH to make Ti 3.1 builds still work + for i in $(find -L ${androidsdkComposition}/libexec/android-sdk-*/build-tools -name zipalign) + do + export PATH=$(dirname $i):$PATH + break + done + ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix index fa01dadc7756..50346ac5115d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix @@ -53,8 +53,10 @@ stdenv.mkDerivation { '' else ""} - # Wrap builder script + # Fix zipalign compatibility issue with newer Android SDKs + sed -i -e 's|zipalign = self.sdk.get_zipalign()|zipalign = "zipalign"|' builder.py + # Wrap builder script mv builder.py .builder.py cat > builder.py <<EOF #!${python}/bin/python |