JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,800 Commits 2 Branches 0 Tags 12 GiB
42f63ff5a8
Commit Graph

188 Commits

Author SHA1 Message Date
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Erik Arvstedt
1b81302d49
androidenv: rename stdenv.lib -> lib 
Removes some visual clutter.
 2019-08-17 11:19:06 +02:00
Erik Arvstedt
2ec43d3509
androidenv/emulate-app: rename androidsdkComposition -> sdk 
This greatly improves readability by shortening some of the overlong lines.
 2019-08-17 11:19:05 +02:00
Erik Arvstedt
0dab612395
androidenv/emulate-app: fix passing extra args to the sdk composition 
This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
 2019-08-17 11:19:02 +02:00
Erik Arvstedt
e48d97f640
androidenv: fix deployment of google_apis* system images 
Fixes #56866
 2019-08-17 11:18:59 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Matthew Bauer
dc42372809
Merge pull request #61168 from matthewbauer/release-cross-fixes 
release-cross.nix changes/fixes
 2019-06-03 20:13:43 -04:00
edef
c89b2de425 androidenv: fix the $out/bin symlink for ndk-bundle 2019-05-24 02:32:14 +00:00
Matthew Bauer
4acc434847 androidenv: add more context to os not found error 
We don’t have android sdk available for aarch64, so this error happens
a lot. Adding some context on what is going on makes this clearer.
 2019-05-08 21:45:33 -04:00
Jan Malakhovski
32e854c156 androidenv: move defaults to package file 2019-02-03 15:33:21 +00:00
Matthew Bauer
9c770c4efa androidenv: move licenseAccepted condition to androidsdk 
The NDK can be built without accepting the license.
 2019-01-29 21:13:41 -05:00
Sander van der Burg
287e92ad47 androidenv: Remove unused patch 2019-01-26 23:17:30 +01:00
Sander van der Burg
9130c1d592 androidsdk: fix missing fontconfig library reference when tools version 26.1.x is used 2019-01-26 21:35:18 +01:00
Sander van der Burg
3bfd3e73bf Reintroduce licenseAccepted option 2018-12-18 21:16:07 +01:00
Sander van der Burg
074c7e99e0 Fix standalone generation script 2018-12-18 21:16:07 +01:00
Sander van der Burg
cb42643b95 Fix inclusion of sources 2018-12-18 21:16:07 +01:00
Sander van der Burg
74750dc67d Replace androidenv by new implementation 2018-12-18 21:16:06 +01:00
Sander van der Burg
2757ddb182 Separate androidndkpkgs from androidenv 2018-12-18 21:14:43 +01:00
Bastian Köcher
cf2d35d889 androidndk: Adds missing patch for 18b 2018-12-16 10:45:42 +01:00
Bastian Köcher
bf44d81df9 androidndk: 17c -> 18b 2018-11-20 11:21:42 +01:00
Clemens Fruhwirth
b4d9f6ddca androidsdk: Re-add emulator that was broken out of the sdk-tools package. 2018-11-12 13:06:22 -04:00
David McFarland
c43abffb9c androidsdk: fix monitor interpreter path 2018-11-10 15:23:11 -04:00
Nick Novitski
d861da151f androidenv: version buildTools and add buildToolsVersions sdk argument 2018-10-26 22:09:47 -07:00
Nick Novitski
4a0ae5d7d6 androidenv: add androidsdk_{8_1,9_0}{,_extras} 2018-10-26 20:45:52 -07:00
Nick Novitski
a61f31cf23 androidenv: run ./fetch.sh 
Manually corrected three problems:
- fetch.sh: android cli cannot find java executable
- addons.nix: google_apis_25 expression not added correctly
- addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
 2018-10-26 20:45:51 -07:00
Nick Novitski
6e07691ed7 androidenv: remove android command from fetch.sh 
It's deprecated, and no longer prints the urls of any xml files for the script
to parse.
 2018-10-26 20:45:51 -07:00
Nick Novitski
ec8f320797 androidenv.androidndk: patch prebuilt 64bit binaries 2018-10-26 20:45:51 -07:00
Nick Novitski
f5c2960a11 androidenv.buildTools: patch hard-coded /bin/ls paths 2018-10-26 20:45:40 -07:00
Nick Novitski
ad501e4c2f androidenv.buildtools: 28.0.2 -> 28.0.3 2018-10-25 11:56:47 -07:00
Nick Novitski
950608bae0 androidsdk: 25.2.5 -> 26.1.1, license agreement 2018-10-25 11:56:47 -07:00
Matthew Bauer
deee27973e
Merge pull request #46720 from baldo/android-platform-tools 
android-platform-tools: 26.0.2 -> 28.0.1
 2018-10-05 22:42:30 -05:00
John Ericson
226d574870 Merge remote-tracking branch 'upstream/master' into darwin-android-ndk-for-master 2018-09-17 22:48:25 -04:00
John Ericson
6769437186 androidndk: Add Darwin support 
Also switch Linux to using the official sha1 hashes for consistency.
They are gotten from https://developer.android.com/ndk/downloads/.
 2018-09-17 22:34:37 -04:00
Andreas Baldeau
1de1bc8038 android-platform-tools: patchelf also binaries new in 28.0.1. 2018-09-16 00:29:46 +02:00
Andreas Baldeau
906e69d638 android-platform-tools: 26.0.2 -> 28.0.1 2018-09-15 23:29:20 +02:00
Bastian Köcher
dd0b3dafc9 androidndk: Add makeStandaloneToolchain support 
Example:
```
let
  toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64");
in
...
```
 2018-09-07 22:03:26 +02:00
Bastian Köcher
48bdf31f58 androidndk: Fix make_standalone_toolchain.py 
Python path needs to be absolute and the generated scripts will use also
an absolute path to `bash`.
 2018-09-07 21:42:49 +02:00
Shea Levy
18337f3ece
Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
Luigy Leon
c759f7a9b7 androidndk: fix eval 
fixup from https://github.com/NixOS/nixpkgs/pull/45820

/cc @Ericson2314
 2018-09-01 19:40:52 -04:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Matthew Bauer
4a5cbdf5ea android: add licenses 
androidndk is apache 2.0
androidsdk is unfree
 2018-08-06 10:15:49 -04:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Bastian Köcher
ea475c1da5 androidndk: Use callPackage to support overriding the fullNdk option 2018-07-10 09:09:34 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
Matthew Bauer
e3475f3406
build-gradle-app.nix: fix eval 
Sorry, typo.
 2018-06-27 13:30:16 -04:00
Matthew Bauer
0d9112f01a
build-gradle-app.nix: mark unfree 
Forgot about this. It needs android-sdk-license & build products should fail when allowUnfree = false.
 2018-06-27 13:29:55 -04:00
Matthew Bauer
5000cc555e android: define __ANDROID_API__ in cflags 
This is needed for targeting older apis.
 2018-06-25 17:12:52 -04:00
Matthew Bauer
d9155904b3 androidndk: add fullNDK option 
Setting this to true will disable removing some of the unused parts of
the NDK toolchain that is unused in Nixpkgs but may be used by others.

/cc @bkchr
 2018-06-25 17:10:11 -04:00