diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2016-01-28 16:19:18 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2016-01-28 16:19:18 +0000 |
| commit | a1cd11aff45bc66d2fecb46b9cf0023822bc4062 (patch) | |
| tree | e7822a049de3303997f5059eff6610c5bc188059 /pkgs/development/mobile/titaniumenv | |
| parent | 6dcfd1a849efa3605bea92ca3c641d30b897126e (diff) | |
| download | nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar.gz nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar.bz2 nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar.lz nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar.xz nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.tar.zst nixlib-a1cd11aff45bc66d2fecb46b9cf0023822bc4062.zip | |
titaniumenv: remove obsolete android configuration steps
Diffstat (limited to 'pkgs/development/mobile/titaniumenv')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/default.nix | 2 |
2 files changed, 1 insertions, 6 deletions
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; |