Sander van der Burg
7a8b65d216
titaniumenv: fix broken function header
2019-02-04 23:07:04 +01:00
Sander van der Burg
8cec070f8c
titaniumenv: add Xcode 10.1 and Titanium 7.5.1 support
2019-02-04 22:50:36 +01:00
Sander van der Burg
9edc2d4dbb
xcodeenv: enable Xcode 10.1 support
2019-02-04 22:43:48 +01: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
b99ac1c904
Remove redundant getBin function
2018-12-18 21:16:07 +01:00
Sander van der Burg
5e690b47fd
adb-sync: fix to make it work with platform-tools
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
53550c826d
Port packages with Android dependencies to new androidenv
2018-12-18 21:16:06 +01:00
Sander van der Burg
27f8b6b89e
Replace titaniumenv with new implementation
2018-12-18 21:16:06 +01:00
Sander van der Burg
907216a57d
Replace xcodeenv with new implementation
2018-12-18 21:16:06 +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
Matthew Bauer
21eeb00a08
treewide: get rid of osx cmake flags
...
Flags that we now set globally:
- CMAKE_OSX_SYSROOT
- CMAKE_OSX_DEPLOYMENT_TARGET
can now be removed.
(cherry picked from commit 8742d5de30dfe2447c0fb56a2e7410b402effc80)
2018-11-05 13:30:42 -06: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
Lionello Lunesu
132ed23f35
xcodeenv.buildApp: inherit meta
...
Without `inherit meta;` there was no easy way for XCode packages to
set meta information of the final derivation.
2018-10-02 12:01:22 +08: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
Jörg Thalheim
b0155aa1e7
Merge pull request #45842 from Kaali/master
...
cocoapods: 1.5.0 -> 1.5.3
2018-09-01 11:25:26 +01:00
Väinö Järvelä
48abc2a788
cocoapods: 1.5.0 -> 1.5.3
2018-08-31 07:22:46 +03: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
Robert Schütz
0cd86e1e9d
adb-sync: use python3 ( #44409 )
...
According to https://github.com/google/adb-sync/pull/2#commitcomment-11399661 ,
it should work with python2 and python3. Using python3 is prefered in nixpkgs.
2018-08-03 19:48:42 +02:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00: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
Matthew Bauer
7652b2ef16
android: add --build-id to ldflags
...
the gcc in android does not have this on by default. Doing this will
fix some of the errors in cross-trunk:
https://hydra.nixos.org/build/76354538/nixlog/11
This is related to how separate debug info is handled in Nixpkgs.
2018-06-25 17:10:11 -04:00
Matthew Bauer
37aab4cbb5
android: more output size reduction
...
This should bring us finally under the 2G max. llvm directory was
missing from my last commit.
2018-06-22 19:06:11 -04:00
Matthew Bauer
e1e9b197f9
android: fix from last output size reduction
...
Directories weren’t being removed properly.
2018-06-22 17:49:28 -04:00
John Ericson
bbef861e0f
Merge pull request #42397 from obsidiansystems/more-android-fixes
...
androidndk: cleanups
2018-06-22 17:17:53 -04:00
Matthew Bauer
7b49d3b335
androidndk: fix eval
2018-06-22 16:51:22 -04:00
Matthew Bauer
054656a2fc
androidndk: reduce output sizw
...
Fixes #41704
2018-06-22 16:48:26 -04:00
Matthew Bauer
a7fc8ad140
androidndk: use unzip
...
This is a free version and preferred to 7zip.
2018-06-22 16:41:08 -04:00
Matthew Bauer
e5d262e1cc
androidndk: fixup
2018-06-22 16:32:05 -04:00
Matthew Bauer
c8fd285c8d
android: add ndkVer to resolve ndk ambiguity
...
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.
/cc @Ericson2314
2018-06-22 11:06:17 -04:00
Matthew Bauer
cf09ffe9aa
android: Use NDK 17 for aarch32
2018-06-22 09:33:25 -04:00
Matthew Justin Bauer
ec2ea29716
Merge pull request #41855 from obsidiansystems/gradle-app
...
init androidenv.buildGradleApp
2018-06-21 17:45:23 -04:00
Matthew Bauer
2a0c328712
androidenv: add "androidsdk_latest" for latest sdk
...
This is easier than having to remember which SDKs are supported, etc.
Stuff based on this can become more future-proof.
2018-06-21 16:09:11 -04:00
Matthew Bauer
b72da4bee8
androidenv.buildGradleApp: refactor
2018-06-21 15:57:56 -04:00
Matthew Bauer
2e8feba171
androidenv: Use fetchzip instead of googlerepository
2018-06-21 12:12:31 -04:00
Matthew Bauer
dfa2895181
androidndk: fixup asm linking
...
This fixes cross compiling to android that is currently broken. The
asm symlink needs to be set on versions /newer/ than 10e not the other
way around. We also need to use hostInfo’s triple here because ...
/cc @ericson2314 @bkchr
2018-06-13 20:31:33 -04:00
Ryan Trinkle
fe04fe868b
Fix gradle build
2018-06-11 13:25:54 -04:00
Ali Abrar
abddf4ab83
Don't append signingConfigs to build.gradle
2018-06-11 13:25:47 -04:00
Ali Abrar
465e3a01d4
Add android sdk license acceptance
2018-06-11 13:25:41 -04:00
Ali Abrar
1cc64da8d4
add signing to buildGradleApp
2018-06-11 13:25:34 -04:00
Ali Abrar
62b59e5353
Add buildGradleApp to androidenv
2018-06-11 13:25:27 -04:00
Matthew Justin Bauer
673628e10c
androidndk: remove set -x
...
This was causing output limit exceeded in Hydra:
https://hydra.nixos.org/build/75406916
2018-06-07 17:04:08 -04:00
Bastian Köcher
495c5a2291
androidndk: Fixes missing libraries for prebuilt clang
2018-05-25 17:32:34 +02:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath.
...
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
2018-05-22 16:42:02 -04:00
Bastian Köcher
832a8ca087
androidndk: Fix usage as crossSystem
2018-05-17 17:22:27 +02:00
Bastian Köcher
c056694d74
androidndk: Adds versions 17 and 16b
2018-05-17 13:18:05 +02:00
Bastian Köcher
9f79ac6f3b
androidndk: Drop 32bit support
2018-05-15 16:58:37 +02:00
John Ericson
92b7a814f2
Merge branch 'fix-gcc-with-float'
2018-05-12 15:21:30 -04:00
John Ericson
f2004e6287
lib: Fix float handling for Aarch32
...
Forgot to adjust default so abi with explicit float attr would be used.
2018-05-12 15:18:31 -04:00
John Ericson
6f40d18d44
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
...
(cherry picked from commit 827ef09140
)
2018-05-12 15:16:16 -04:00
John Ericson
827ef09140
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
2018-05-11 19:17:35 -04:00
Ruben Maher
18f4abb0ad
cocoapods: 1.3.1 -> 1.5.0
2018-05-10 09:53:58 +09:30
Alexandre Esteves
85b5fc7c98
xcodeenv: fix typo
2018-05-06 21:34:05 +00:00
Matthew Bauer
143978a477
treewide: remove platform assertions
...
linux: readd assertion
2018-05-03 13:09:20 -05:00
Florian Klink
1b4027c6fc
abootimg: init at 0.6
2018-04-23 14:09:41 +02:00
Peter Romfeld
f5b3f9962e
cocoapods: init at 1.3.1 ( #32583 )
...
* cocoapods: init at 1.3.1
* requires xcode
2018-04-21 14:37:56 -05:00
Matthew Justin Bauer
d30f7a5aa8
Merge pull request #36911 from rasendubi/android-build-tools
...
androidenv.buildTools: 26.0.1 -> 26.0.2
2018-04-17 10:26:11 -05:00
Nikolay Amiantov
6bf1421f13
treewide: refactor to use libglvnd
...
* Implement libGL as a symlink package which uses libraries from libglvnd and
headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Sander van der Burg
112ebed491
xcodeenv: publish xcarchive directory in the output store path if requested
2018-03-22 15:02:09 +01:00
Sander van der Burg
f2bd9d4745
xcodeenv: replace deprecated package application procedure by the new export archive operation
2018-03-22 14:33:15 +01:00
Sander van der Burg
479ec3d888
titaniumenv: fix renaming strategy
2018-03-21 16:08:56 +01:00
Sander van der Burg
603556085b
titaniumenv: update example app
2018-03-21 15:51:07 +01:00
Sander van der Burg
4beb695ece
titaniumenv: fix Android signing on darwin
2018-03-21 14:57:57 +01:00
Sander van der Burg
5532cc1641
titaniumenv: remove obsolete java fix wrapper on darwin
2018-03-20 17:39:45 +01:00
Sander van der Burg
e8e7e78d9f
titaniumenv: add 7.1 SDK and make it the default
2018-03-20 17:22:32 +01:00
Alexey Shmalko
6ef19f8e97
androidenv.buildTools: 26.0.1 -> 26.0.2
2018-03-13 18:15:44 +02:00
Vladimír Čunát
565bd805e6
Merge branch 'master'
2018-03-05 14:53:27 +01:00