public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

titaniumsdk: Fix Titanium SDK 3.1 compatibility with the new Android SDK

Browse Source
This commit is contained in:
Sander van der Burg 2014-10-14 12:14:05 +02:00
parent 8523d0e44c
commit 3ce9467f49
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -49,6 +49,13 @@ stdenv.mkDerivation {
'' ''
titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* 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 ${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'' ''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 else

4
pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
View File

@ -53,8 +53,10 @@ stdenv.mkDerivation {
'' ''
else ""} 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 mv builder.py .builder.py
cat > builder.py <<EOF cat > builder.py <<EOF
#!${python}/bin/python #!${python}/bin/python