Lluís Batlle i Rossell
|
b58780c43d
|
Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
|
2012-12-28 23:28:16 +01:00 |
|
|
Eelco Dolstra
|
84779a6f7d
|
Remove unnecessary parentheses around if conditions
Pet peeve...
|
2012-12-28 19:54:15 +01:00 |
|
|
Sander van der Burg
|
8602eeda81
|
- Updated android SDK to version 21
- Updated platform-tools, addons and system-images that belong to release 21 accordingly
- We must also patch 64-bit emulator instances now
|
2012-12-20 14:04:52 +01:00 |
|
|
Eelco Dolstra
|
a034c4b935
|
androidenv: Remove examples directory
As discussed on nix-dev, it's better to use fetchurl to obtain the
source of the examples.
|
2012-11-20 11:29:04 +01:00 |
|
|
Eelco Dolstra
|
2b255bb04d
|
android-sdk: Add another exec
|
2012-11-14 11:38:28 +01:00 |
|
|
Eelco Dolstra
|
140d91fdc9
|
Use patchShebangs instead of obsolete shebangfix
|
2012-11-08 16:49:36 +01:00 |
|
|
Eelco Dolstra
|
e89eab8893
|
Make "nix-env -i android-sdk" DTRT
|
2012-11-08 16:38:38 +01:00 |
|
|
Sander van der Burg
|
8349754e2a
|
Fix two wrong paths, due to path refactoring so that the emulation script works again
|
2012-11-08 16:30:36 +01:00 |
|
|
Sander van der Burg
|
24d9e59cbb
|
Implemented some sanity - the SDK resides in libexec/ now. I have added wrappers in bin/ that allow users to run the tools by installing an SDK composition in their profile
|
2012-11-08 15:01:06 +01:00 |
|
|
Sander van der Burg
|
dec84b2bcd
|
Added android_sdk_4_1 derivation that provides a precomposed SDK with everything required to develop for Android OS 4.1
|
2012-11-08 13:55:53 +01:00 |
|
|
Sander van der Burg
|
123c3f91a3
|
Removed result symlink
|
2012-11-07 21:12:24 +01:00 |
|
|
Sander van der Burg
|
3afa95bfba
|
Added androidenv - the Android SDK, their additions and two functions that build and emulate Android Apps
|
2012-11-07 21:10:39 +01:00 |
|