Commit Graph

342 Commits

Author SHA1 Message Date
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
John Ericson
2482e2858e prebuilt android tools: Init using SDK
Expose as an option for the cross stdenv.
2018-02-27 14:15:39 -05:00
Yegor Timoshenko
40a63aa999 imgpatchtools: init at 0.3 2018-02-25 16:49:23 +00:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
John Ericson
7748972763 androidenv: Better platform conditionals 2018-02-24 01:43:10 -05:00
John Ericson
fe5ae8b550 androidenv: Clean up whitespace 2018-02-24 01:43:10 -05:00
Will Dietz
e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Profpatsch
53e790e7a8 maintainers: capitalize the Profpatsch attribute (vanity)
Since I’m already at it, this has been bothering me for a while.
2018-02-12 07:24:50 +01:00
Will Dietz
5dc6306e9c xpwn: build usb-based tools by replacing libusb1 dep with libusb
Otherwise the build fails to detect libusb and doesn't build
the 'xpwn' and 'dfu-util' tools.

New tools run but I don't have any suitable devices to test :).

(I believe latest iGadgets need a newer version of xpwn anyway)
2018-02-01 14:15:02 -06:00
Sander van der Burg
0d7a0d7572 titaniumenv: fix nasty IPA generation bug 2018-01-31 18:56:47 +01:00
Sander van der Burg
fe6510369d titaniumenv: add parameter that specifies than an IPA build is a store build 2018-01-31 15:33:03 +01:00
Sander van der Burg
a18da9b689 titaniumenv: add hack to reduce keychain blocking problems 2018-01-09 13:24:30 +01:00
Sander van der Burg
792d48bc94 titaniumenv: fix path to IPA build product 2018-01-09 12:30:58 +01:00
Sander van der Burg
b481181897 titaniumenv: bump default versions of the SDK and Xcode 2018-01-05 13:50:05 +01:00
Sander van der Burg
fb346c3402 titaniumenv: upgrade to 6.3 and remove deprecated old versions 2018-01-05 12:34:03 +01:00
Sander van der Burg
61a7f0bbf0 xcodeenv: use 9.2 by default 2018-01-05 11:47:30 +01:00
Sander van der Burg
62f7fc8c19 xcodebuild: fix to make it build against the 11.2 iphone SDK 2018-01-05 11:40:34 +01:00
Piotr Bogdan
de0517642d flashtool: mark as broken
The sources are no longer obtainable from the URL specified in the
expression and the package has no maintainers.
2017-12-23 22:54:31 +00:00
Benjamin Hipple
4e022bab76 android-platform-tools: 26.0.0 -> 26.0.2 2017-12-03 16:58:03 -05:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Michael Weiss
af78d76718 androidenv: Add the Android Instant Apps SDK 2017-09-09 16:47:19 +02:00
Michael Weiss
498e3a9989 androidenv: Update all packages using fetch.sh 2017-09-09 15:52:07 +02:00
Volth
37e73450d6 androidndk: wrap scripts in $out/libexec 2017-08-17 15:46:01 +00:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
taku0
53301fcd63 android-sdk: 25.2.3 -> 25.2.5 2017-08-05 22:22:18 +09:00
Michael Weiss
8f141b2a07 androidenv: Update all packages using fetch.sh 2017-08-04 00:07:39 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Jörg Thalheim
fa68544156 adbfs-rootless: limit platform to linux 2017-06-29 08:20:54 +01:00
Profpatsch
da012dda01 adbfs-rootless: init at 2016-10-02 2017-06-29 08:44:43 +02:00
Michael Weiss
d17bcfc5f0 androidenv: Manually update missing packages
Improvement: Use nix-shell for fetch.sh

androidsdk{,_extras}:
- Update to 7.1.1

google_apis_25 is missing after fetch.sh due to an error in addon.xml
(upsteam bug).

Addons:
- Add google_apis_25
- Update google_play_services (v8_rc41 -> v11_rc16)
2017-06-10 03:57:30 +02:00
Michael Weiss
fb26e5c8b6 androidenv: Update all packages using fetch.sh
Platforms:
- Update platform_25 (r02 -> r03)
- Add platform_26

Sources:
- Add source_25
2017-06-10 02:29:59 +02:00
Michael Raskin
adadf7e5ce androidsdk: meta.url to meta.homepage 2017-04-29 12:26:16 +02:00
John Ericson
4c0d7da183 Get rid of all with { inherit... } and just used let inherit...
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
2017-03-30 03:05:05 -04:00
Sander van der Burg
b81001188c xcodeenv, titaniumenv: fix IPA builds by granting codesign the right permissions 2017-01-27 10:50:36 +01:00
Sander van der Burg
0f6eab52e1 xcodeenv: make it work with Xcode 8.2.1 2017-01-25 16:56:55 +01:00
Sander van der Burg
de9a4f5fb4 titaniumenv: add 6.0 SDK + bump kitchensink testcase 2017-01-24 13:22:16 +01:00
Sander van der Burg
4f7fe27065 titaniumenv: use Node.js 4.x for the CLI tools 2017-01-24 10:55:29 +01:00
taku0
cbcdfdb576 android-sdk: 25.2.2 -> 25.2.3 2016-12-10 19:51:55 +09:00
Alex Ivanov
af1dacc2c3 genymotion: 2.7.2 -> 2.8.0 2016-11-27 13:18:24 +03:00
Alex Ivanov
244f0456f0 genymotion: add menu item 2016-11-27 12:21:25 +03:00
taku0
a229fd4ce3 androidenv: Add API sources 2016-10-09 19:11:55 +09:00
Herwig Hochleitner
685786b7d7 androidenv: update packages
build-tools      25.1.7 -> 25.2.2
sdk-tools        23.0.1 -> 24.0.2
platform-tools   24 -> 24.0.2
2016-09-14 18:31:22 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Sergiu Ivanov
9d3172f140 adb-sync: Make platforms correspond to those of androidsdk (main dependency). 2016-09-06 23:55:36 +02:00
Sergiu Ivanov
33cf2d9416 adb-sync: init at 2016-08-31 2016-09-02 16:44:41 +02:00
Sander van der Burg
b17cd148ba androidsdk: fix buildApp and emulateApp functions by providing the right executable paths + fix android emulator by adding dbus to the library path 2016-09-01 13:56:35 +00:00
Sander van der Burg
21666526b9 titaniumsdk: fix to make it work with new android SDK and NPM packages + add titaniumsdk version 5.2 2016-09-01 13:25:46 +00:00
Tuomas Tynkkynen
f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
d3705faa56 treewide: Use makeLibraryPath in LD_LIBRARY_PATHs 2016-08-23 00:14:00 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Tuomas Tynkkynen
b7e9207a67 androidenv: Don't build on Hydra
Output limit exceeded:

http://hydra.nixos.org/build/38236076
http://hydra.nixos.org/build/38235851
2016-08-02 22:55:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
taku0
2ac2676a17 android-sdk: 24.4.1 -> 25.1.7 (#17193) 2016-07-25 20:47:39 +01:00
Brian McKenna
c816d053bc genymotion: init at 2.7.2 (#17203) 2016-07-25 06:12:29 +02:00
taku0
c643c86035 android-platform-tools: 23.0.1 -> 24, etc.
- `adb` is now 64 bit. Linking against 64 bit libraries.
- Added `.lib` or `.out` postfix for 32 bit library packages.
- Some libraries are reside in `lib64` instead of `lib`.
- Other version bumps.
2016-07-21 21:20:05 +09:00
Sander van der Burg
92ef67b57c androidsdk: fix rpath that includes 32-bit zlib 2016-07-07 16:23:25 +00:00