Commit graph

493 commits

Author SHA1 Message Date
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
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
Nikolay Amiantov 5bed7df058 Revert "[WIP] flashtool: 0.9.14.0 -> 0.9.23.3"
This reverts commit 0e5c802120.

It was pulled accidentially -- this is not ready yet.
2016-07-04 00:23:42 +03:00
Lengyel Balázs 0e5c802120 [WIP] flashtool: 0.9.14.0 -> 0.9.23.3 2016-07-03 20:22:35 +03:00
Benno Fünfstück b01886d654 fix 32bit android emulator 2016-07-01 21:41:32 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Thomas Tuegel 3ef7671cea ncurses: combine $lib and $out outputs
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
zimbatm 17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sander van der Burg b90f0116cd titaniumenv: allow distributions of app with spaces in their name 2016-02-02 13:42:15 +00:00
Sander van der Burg 4d0e732168 titaniumenv: fix android builds on darwin and get rid of allowUnfree since the OpenJDK just works fine 2016-02-01 15:11:28 +00:00
Sander van der Burg e2cefce69a titaniumenv: fix path to the IPA file in the hydra-build-products 2016-01-29 14:08:03 +00:00
Sander van der Burg a1cd11aff4 titaniumenv: remove obsolete android configuration steps 2016-01-28 16:19:18 +00:00
Sander van der Burg b4e47d1ab8 titaniumenv: change identifier to 5.1.2.GA 2016-01-28 14:39:21 +00:00
Sander van der Burg 4dc36b1227 titaniumenv: use version 5.1.2 by default in the example 2016-01-28 14:36:51 +00:00
Sander van der Burg b205b587e7 titaniumenv: remove obsolete iosWwdrCertificate parameter 2016-01-28 13:32:21 +00:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen 8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 69498299dd treewide: Mass replace 'libusb1}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Yacine Hmito 1d8313042d Renamed subdirectories in Android SKD's build-tools
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
2016-01-18 00:42:54 +01:00
Sander van der Burg 6ea56a46fb titaniumsdk: bump to version 5.1.2 2016-01-13 10:49:34 +00:00
Sander van der Burg b6d84748b9 xcodeenv: make it work with xcode 7.2 2016-01-07 14:43:17 +00:00
Sander van der Burg d268fa7676 titaniumsdk: add SDK version 5.1 and remove older versions 2016-01-07 13:47:26 +00:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
taku0 11af8857cd android-sdk: 24.3.4 -> 24.4, android-ndk: r10c -> r10e 2015-10-18 19:02:23 +09:00
Sander van der Burg 62e676b959 androidenv: fix broken, less frequently used command-line tools 2015-10-15 14:42:24 +00:00
Vladimír Čunát 91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Sander van der Burg 0915f16167 androidsdk: add SDK option for Android API-level 23 2015-10-06 13:26:53 +00:00
Sander van der Burg aeabfbe846 androidsdk: bump to version 24.3.4 and update associated sub packages 2015-10-06 12:27:49 +00:00
Vladimír Čunát f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Sander van der Burg cae7278fae titaniumsdk: upgrade 3.5.0 to 3.5.1 2015-05-19 14:27:55 +00:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
taku0 d88736df6c androidsdk: Make monitor and other commands to work 2015-05-03 23:03:36 +09:00
taku0 dd89ec5785 Bump Android packages to newest versions, add androidsdk_5_1_1 and androidsdk_5_1_1_extras to env
Detailed changes:
- android-sdk: update 24.0.1 -> 24.1.2
- android-platforms: add 5.1.1
- android-platform-tools: update 21 -> 22
- android-build-tools: update 21.1.2 -> 22.0.1
- android-support: update 21 -> 22.1.1
- android-support-repository: update 9 -> 14
2015-05-02 22:15:29 +09:00
Nikolay Amiantov 298341f1c4 androidEnv.platformTools: add /bin 2015-04-22 17:35:00 +03:00
Gareth Smith 9d57638439 Pulled androidndk_r8e into a separate file. 2015-03-03 15:31:49 +00:00
Gareth Smith 487dc80d8a Add option to build old androidndk r8e.
This version is the one required to build mobile Firefox. See build
documentation here:

https://wiki.mozilla.org/Mobile/Fennec/Android/Detailed_build_instructions#Install_Android_NDK
2015-03-03 14:08:53 +00:00
Gareth Smith 1ae10523c8 Added options for androidsdk to use more extras.
Existing packages should perform unchanged. There's a new package called
androidsdk_5_0_1_extras which adds support for android support libraries
and google play services.
2015-03-01 21:11:03 +00:00
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