Commit Graph

273 Commits

Author SHA1 Message Date
Sander van der Burg
b205b587e7 titaniumenv: remove obsolete iosWwdrCertificate parameter 2016-01-28 13:32:21 +00:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
69498299dd treewide: Mass replace 'libusb1}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Yacine Hmito
1d8313042d Renamed subdirectories in Android SKD's build-tools
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
2016-01-18 00:42:54 +01:00
Sander van der Burg
6ea56a46fb titaniumsdk: bump to version 5.1.2 2016-01-13 10:49:34 +00:00
Sander van der Burg
b6d84748b9 xcodeenv: make it work with xcode 7.2 2016-01-07 14:43:17 +00:00
Sander van der Burg
d268fa7676 titaniumsdk: add SDK version 5.1 and remove older versions 2016-01-07 13:47:26 +00:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
taku0
11af8857cd android-sdk: 24.3.4 -> 24.4, android-ndk: r10c -> r10e 2015-10-18 19:02:23 +09:00
Sander van der Burg
62e676b959 androidenv: fix broken, less frequently used command-line tools 2015-10-15 14:42:24 +00:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Sander van der Burg
0915f16167 androidsdk: add SDK option for Android API-level 23 2015-10-06 13:26:53 +00:00
Sander van der Burg
aeabfbe846 androidsdk: bump to version 24.3.4 and update associated sub packages 2015-10-06 12:27:49 +00:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Sander van der Burg
cae7278fae titaniumsdk: upgrade 3.5.0 to 3.5.1 2015-05-19 14:27:55 +00:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
taku0
d88736df6c androidsdk: Make monitor and other commands to work 2015-05-03 23:03:36 +09:00
taku0
dd89ec5785 Bump Android packages to newest versions, add androidsdk_5_1_1 and androidsdk_5_1_1_extras to env
Detailed changes:
- android-sdk: update 24.0.1 -> 24.1.2
- android-platforms: add 5.1.1
- android-platform-tools: update 21 -> 22
- android-build-tools: update 21.1.2 -> 22.0.1
- android-support: update 21 -> 22.1.1
- android-support-repository: update 9 -> 14
2015-05-02 22:15:29 +09:00
Nikolay Amiantov
298341f1c4 androidEnv.platformTools: add /bin 2015-04-22 17:35:00 +03:00
Gareth Smith
9d57638439 Pulled androidndk_r8e into a separate file. 2015-03-03 15:31:49 +00:00
Gareth Smith
487dc80d8a Add option to build old androidndk r8e.
This version is the one required to build mobile Firefox. See build
documentation here:

https://wiki.mozilla.org/Mobile/Fennec/Android/Detailed_build_instructions#Install_Android_NDK
2015-03-03 14:08:53 +00:00
Gareth Smith
1ae10523c8 Added options for androidsdk to use more extras.
Existing packages should perform unchanged. There's a new package called
androidsdk_5_0_1_extras which adds support for android support libraries
and google play services.
2015-03-01 21:11:03 +00:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Sander van der Burg
6df95597ed titaniumenv: Fix unpack step and change default iOS SDK to 8.1 2015-01-23 15:57:34 +00:00
Sander van der Burg
0878b2e9be titaniumenv: Add Titanium SDK 3.5.0 support 2015-01-22 16:08:23 +00:00
Sander van der Burg
53a4002bbc xcodeenv: make version 6.1.1 the default 2015-01-22 15:36:58 +00:00
Eric Seidel
b070eacfcd rename occurrences of cc.gcc to cc.cc 2015-01-14 20:51:58 -08:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Shea Levy
7e0a5c38f3 More gcc->cc refs 2014-12-26 12:33:16 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Cray Elliott
80838029ac Bump Android packages to newest versions, add androidsdk_5_0_1 to env
Detailed changes:
- android-sdk: update 23.0.2 -> 24.0.1
- android-platforms: add 5.0.1
- android-platform-tools: update 19 -> 21
- android-build-tools: update 20 -> 21.1.2
- android-support: update 18 -> 21
- android-support-repository: update 5 -> 9

This commit was authored by ewemoa, reviewed by me
2014-12-15 23:29:02 -08:00
Cray Elliott
35d5e4de76 add android build tools to $PATH
commited on behalf of ewemoa
2014-11-24 00:47:57 -08:00
Cray Elliott
6872a4a797 Fix Android NDK package, previously ndk-build was not being properly put in $PATH
This commit also brings in the dependencies ndk-build needs and fixes a bug with
permissions

This was commited on behalf of ewemoa
2014-11-24 00:20:40 -08:00
Domen Kožar
11a414ddd5 fix eval 2014-11-24 08:57:18 +01:00
Maciek Starzyk
9bb60c9e20 Removed duplicate 2014-11-11 00:14:54 +01:00
Maciek Starzyk
e176105535 android-ndk: r9d -> r10c 2014-11-10 23:54:44 +01:00
Sander van der Burg
75175fa3eb titaniumenv: Add parameter that configures Apple's WWDR certificate location 2014-10-28 11:40:12 +01:00
Sander van der Burg
c5f3b32ac5 titaniumenv: Make iOS SDK version configurable in example 2014-10-27 22:55:14 +01:00
Sander van der Burg
d2e2bdd81e titaniumenv: make the login keychain the default, before the generated keychain gets discarded. Otherwise, the keychain becomes corrupt 2014-10-27 17:30:08 +01:00
Sander van der Burg
8436f4d871 xcodeenv: make the login keychain the default, before the generated keychain gets discarded. Otherwise, the keychain becomes corrupt 2014-10-27 17:24:35 +01:00
Sander van der Burg
0100e79d7a titaniumenv: Use new xcodeenv simulate function in the example app 2014-10-15 17:28:52 +02:00
Sander van der Burg
f58b563cb6 xcodeenv: Reimplement simulator script to work with Xcode 6 2014-10-15 17:10:35 +02:00
Sander van der Burg
7dc624e347 titaniumsdk: Make iOS SDK version configurable 2014-10-14 18:59:31 +02:00
Sander van der Burg
2375a55e1e titaniumenv: Make path to xcode configurable through the build function 2014-10-14 14:57:11 +02:00
Sander van der Burg
3ce9467f49 titaniumsdk: Fix Titanium SDK 3.1 compatibility with the new Android SDK 2014-10-14 12:14:05 +02:00
Sander van der Burg
323509e11c titaniumenv: use xcode version 6.0.1 by default 2014-10-14 01:12:22 +02:00
Sander van der Burg
fa99c0d0b1 xcodeenv: make version 6.0.1 the default 2014-10-14 00:27:23 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Sander van der Burg
c07579aa4a titaniumsdk: Make xcode path configurable 2014-10-07 18:13:52 +02:00
Sander van der Burg
0a7449775d titaniumsdk: Add expression to 3.4.0 SDK 2014-10-07 15:31:11 +02:00
Sander van der Burg
2b5a27c3d8 titaniumsdk: Add version 3.4.0 support 2014-10-07 15:29:58 +02:00
Sander van der Burg
470007e7e1 Make path to Xcode configurable 2014-10-02 15:49:33 +02:00
Siarhei Zirukin
ec1118cbb9 androidndk: fix make-standalone-toolchain.sh helper script
The script does a copy of a toolchain and then rearranges files a bit.
The problem is that these files have the same permissions (read-only)
as installed ones. The patch fixes the problem by changing permissions
of the copy before doing anything else.
2014-09-25 11:59:16 +02:00
Emil Rangden
17d7f653c3 Make emulator script run without tools in path 2014-09-17 20:58:09 +02:00
Daniel Peebles
f8cc943afb Fix #4019 2014-09-10 23:17:26 -04:00
Sander van der Burg
7b7fd5044f androidsdk: remove obsolete workaround 2014-09-02 19:19:03 +02:00
Sander van der Burg
800beea5f9 androidsdk: Bump to version 23.02 and update all its plugins and conversion scripts 2014-09-02 19:18:30 +02:00
Cray Elliott
02f5f25b2d merge in ewemoa's zipalign fix with my updated build-tools
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
2014-09-02 19:17:47 +02:00
Cray Elliott
c8871e0b65 ewemoa : add the Android Support repository 2014-09-02 14:09:01 +02:00
Sander van der Burg
3b0c725255 Add attributes for all relevant Android SDK API levels and their capabilities 2014-09-02 14:05:09 +02:00
Jos van den Oever
6f50af7206 Some additional android runtimes. 2014-08-23 11:03:29 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Sander van der Burg
7eb93f944b Implemented wireless adhoc distribution support for titanium apps 2014-08-04 11:26:14 +02:00
Sander van der Burg
bffdf03e4f Support app names with white spaces 2014-08-04 11:23:55 +02:00
Sander van der Burg
b0769d8db1 Use hyperlink and click action instead of meta refresh 2014-08-01 19:26:34 +02:00
Sander van der Burg
5a918f5f5c Add experimental link to proxy to page that does wireless distributions of IPA files 2014-08-01 18:34:18 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Sander van der Burg
600f854260 titaniumsdk: Bump to version 3.3.0.GA stable 2014-07-18 16:59:36 +02:00
Sander van der Burg
d3d3120052 Support UUIDs in lowercase 2014-07-18 16:40:15 +02:00
Sander van der Burg
a8e4abaf6f titaniumsdk: add version 3.3 SDK and update kitchensink example 2014-07-15 16:46:59 +02:00
Sander van der Burg
bce5f2cf56 titaniumsdk: Bump to version 3.2.3 2014-07-15 16:05:25 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Charles Strahan
af479a67b7 Fix xpwn on Darwin and other case-insensitive file systems 2014-06-06 18:06:03 -04:00
Cillian de Róiste
aa5c229223 androidsdk: upgrade 22.3 -> 22.6.2 2014-05-08 00:49:19 +02:00
Sander van der Burg
281126d7ee Merge pull request #2346 from cpages/android
Add android ndk support
2014-04-21 23:27:10 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Carles Pagès
8267fa4694 androidndk: add v9d
I also updated the buildApp expression so it can build ndk based apps, when
setting useNDK to true.
2014-04-20 11:29:10 +02:00
Sander van der Burg
e9a1b1e18c Add allowUnfree parameter to allow Java builds to work 2014-04-18 20:05:39 +02:00
Sander van der Burg
2cb2be8161 titaniumsdk: Bump version to 3.2.2 2014-03-12 12:04:38 +01:00
aszlig
5e565754ab
Add new package "xpwn" from @dborca's fork.
This really hase some nice utilities for coping with HFS+ and DMG
format. We're going to use it for extracting the xcode DMG, but it could
be used for more, even generating DMGs.

The reason I'm using the fork instead of the repository from
@planetbeing is thet the fork contains a few fixes, especially for
dealing with symlinks in HFS+ images.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:43 +01:00
Eelco Dolstra
4c2d1184fa flashtool: Fix evaluation 2014-02-28 16:18:31 +01:00
Peter Simons
893fc5e2f3 flashtool: add a license tag 2014-02-28 12:13:46 +01:00
Peter Simons
88078e4379 flashtool: clean up the build some more 2014-02-28 12:13:46 +01:00
Peter Simons
21234d5f1a flashtool: add version 0.9.14.0 2014-02-28 11:02:31 +01:00
Sander van der Burg
70449b220d androidsdk: fix activity launching 2014-02-27 23:08:13 +01:00
Sander van der Burg
9d7b1dca8f androidsdk: only create AVD if needed + some fixes 2014-02-27 19:26:18 +01:00
Sander van der Burg
416db1de92 androidsdk: Make AVD storage dir configurable and make activation step optional 2014-02-27 18:46:06 +01:00
Sander van der Burg
fc4e653167 titaniumsdk: Fix issue with APK with spaces in them 2014-02-21 16:20:27 +01:00
Sander van der Burg
f5a9e5188d titaniumsdk: remove some obsolete debugging stuff 2014-02-20 14:19:32 +01:00
Sander van der Burg
70798243a2 titaniumsdk: Add 3.2 SDK option 2014-02-18 16:34:34 +01:00
Sander van der Burg
1f42b02624 androidenv: also allow references to individual apk files 2014-01-28 19:09:08 +01:00
Sander van der Burg
b25529a4ad titaniumsdk: colored output makes a web server think that logs are in raw format. So disable it 2014-01-23 17:11:16 +01:00
Sander van der Burg
1a24278161 titaniumsdk: Add additional login simulation for the ipa target 2014-01-23 15:11:46 +01:00
Sander van der Burg
eb85038518 titaniumsdk: Replace deprecated python build tools by the new NodeJS based tool 2014-01-21 17:19:26 +01:00
Sander van der Burg
8faebb5323 Make iphone SDK 7.0 the default 2014-01-15 21:52:43 +01:00
Sander van der Burg
b9cbab922e Fix building with recent openjdk 2014-01-15 16:32:40 +01:00
Sander van der Burg
512a3a4e46 Set JAVA_HOME while building 2014-01-15 15:25:50 +01:00
Sander van der Burg
0a3fcd502e Add missing build dependency for Android 2014-01-15 14:55:35 +01:00
Sander van der Burg
abf6896aaf Added testcases for signed Android and iOS apps 2014-01-15 13:37:40 +01:00
Sander van der Burg
b15578ac60 iOS keyfile means provisioning profile 2014-01-13 15:22:11 +01:00
Sander van der Burg
c8bf65d253 Minor android version fix 2014-01-13 15:06:04 +01:00
Sander van der Burg
4fd601d9ed Fix emulate android job 2014-01-13 14:58:25 +01:00
Sander van der Burg
0583cb37e6 Make xcode version configurable + fix android emulator tests 2014-01-13 14:34:46 +01:00
Sander van der Burg
25bd160ca8 Make xcode version configurable 2014-01-13 14:24:48 +01:00
Sander van der Burg
dca1c4afb0 Removed old SDK version support and updated kitchensink version 2014-01-13 14:15:05 +01:00
Sander van der Burg
10a6618d60 Removed titanium SDK 2.1, since it's deprecated long ago and no longer works with the new Android SDK 2014-01-13 13:52:43 +01:00
Sander van der Burg
e998a1c729 Add two additional API level compositions 2014-01-13 13:25:12 +01:00
Sander van der Burg
2f624cd1fa Make xcode detection a bit more robust and configurable 2013-12-24 14:34:56 +01:00
Shea Levy
4a1a28faeb Revert android build tools update
https://code.google.com/p/android/issues/detail?id=61710
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-02 21:41:40 -05:00
Shea Levy
35e47a4a47 Update android sdks
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-02 20:27:53 -05:00
Sander van der Burg
521ea15f14 We need to use ... to allow other parameters 2013-10-15 16:48:42 +02:00
Sander van der Burg
f24e20f1e3 Support Xcode 5.0 2013-10-15 16:32:38 +02:00
Sander van der Burg
ce7f235a09 Make arbitrary arguments to the generic builder possible 2013-10-15 16:32:16 +02:00
Sander van der Burg
bb69f658ea Bump titaniumsdk to 3.1.4 2013-09-27 17:56:01 +02:00
Mathijs Kwik
5eeb02f67c android-sdk: upgrade to latests versions 2013-09-18 14:37:38 +02:00
Sander van der Burg
370db596b9 Bumped Android SDK to version 22.2 and updated its addons 2013-09-18 12:05:14 +02:00
Sander van der Burg
bf1c37494e Moved reference to iPhone SDKs to the wrapper that proxies to Xcode 2013-08-16 13:20:59 +02:00
Sander van der Burg
0e91a58bbe The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK 2013-08-08 10:40:09 +02:00
Sander van der Burg
a9b4851b74 The android utility's GUI should work and wrapper scripts in bin/ are replaced by symlinks 2013-08-07 22:12:44 +02:00
Sander van der Burg
d435b39201 Make AVD creating configurable at runtime 2013-08-06 14:11:34 +02:00
Sander van der Burg
dbcb178ef2 Added extraAVDFiles parameter to support custom system images 2013-08-06 11:16:51 +02:00
Sander van der Burg
ed70cc9830 We must also take Android's ABI version into account 2013-08-06 10:41:13 +02:00
Sander van der Burg
f5f5f69ef0 The emulator needs file in its PATH and alsaLib 2013-08-05 22:18:56 +02:00
Sander van der Burg
7019b685de Make the emulator flags configurable at runtime and unimportant messages should go the stderr 2013-08-05 19:08:58 +02:00
Sander van der Burg
a82fcea437 Make iPhone simulator SDKs configurable 2013-08-05 12:47:57 +02:00
Sander van der Burg
9a2b9ba6b3 Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's OpenGL driver to be used 2013-08-01 12:43:33 +02:00
Sander van der Burg
c81e70fc30 Shut up annoying question to configure hardware profiles 2013-08-01 11:32:57 +02:00
Sander van der Burg
77dd343e1e - System images are not required for building. Disabling them makes building faster.
- Make ant flags configurable
2013-08-01 11:21:54 +02:00
Sander van der Burg
1c8b4c8950 Now x86 and mips images from external repositories are supported + added GPU option to the emulate function 2013-07-31 18:56:27 +02:00
Sander van der Burg
c324091a77 Fixed incorrect platform-tools sha1 value 2013-07-31 16:14:47 +02:00
Sander van der Burg
ab9be1b809 Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration 2013-07-31 16:00:57 +02:00
Sander van der Burg
41932dd135 Do not make assumptions on the scheme name, but let xcodebuild decide about it 2013-07-15 11:32:12 +02:00
Sander van der Burg
e5c7533b6c titaniumsdk: Bump to version 3.1.1 2013-06-13 13:58:32 +02:00
Sander van der Burg
2b1eff8e17 Override the KitchenSink's appName 2013-05-29 15:17:37 +02:00
Sander van der Burg
c30eed4b44 Allow one to override the app's name through the appName parameter 2013-05-29 15:16:21 +02:00
Sander van der Burg
a2b8fb3776 It's impossible to guess the name so we add an extra optional parameter to override it 2013-05-29 15:01:55 +02:00
Sander van der Burg
a7895de1fc Use double quotes to expand wildcards 2013-05-29 14:50:24 +02:00
Sander van der Burg
cf512cf5c2 Use wildcard for the appname 2013-05-29 14:18:35 +02:00
Sander van der Burg
dde4a92c5c Generate unique derivation names so that we can easily install them from a Nix channel 2013-05-29 13:50:53 +02:00
Sander van der Burg
3f0ee819e2 titaniumsdk: Updated KitchenSink example + fix native libraries 2013-04-17 13:52:42 +02:00
Sander van der Burg
92e089187d titaniumsdk: Removed obsolete src parameter 2013-04-16 16:23:20 +02:00
Sander van der Burg
1d255f9ab3 titaniumsdk: Added version 3.1 next to version 2.1, and make it configurable 2013-04-16 14:08:37 +02:00
Sander van der Burg
770741b5b4 androidenv: fix error with obsolete quotation 2013-03-21 14:21:20 +01:00
Sander van der Burg
647bca444c Allow appnames with spaces everywhere 2013-03-21 14:11:58 +01:00
Sander van der Burg
eacb6c1506 xcodeenv: Add IPA file to Hydra build products 2013-03-15 16:18:45 +01:00