1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

147 commits

Author SHA1 Message Date
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