Commit Graph

184 Commits

Author SHA1 Message Date
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
Eric Seidel
b070eacfcd rename occurrences of cc.gcc to cc.cc 2015-01-14 20:51:58 -08:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Shea Levy
7e0a5c38f3 More gcc->cc refs 2014-12-26 12:33:16 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Cray Elliott
80838029ac Bump Android packages to newest versions, add androidsdk_5_0_1 to env
Detailed changes:
- android-sdk: update 23.0.2 -> 24.0.1
- android-platforms: add 5.0.1
- android-platform-tools: update 19 -> 21
- android-build-tools: update 20 -> 21.1.2
- android-support: update 18 -> 21
- android-support-repository: update 5 -> 9

This commit was authored by ewemoa, reviewed by me
2014-12-15 23:29:02 -08:00
Cray Elliott
35d5e4de76 add android build tools to $PATH
commited on behalf of ewemoa
2014-11-24 00:47:57 -08:00
Cray Elliott
6872a4a797 Fix Android NDK package, previously ndk-build was not being properly put in $PATH
This commit also brings in the dependencies ndk-build needs and fixes a bug with
permissions

This was commited on behalf of ewemoa
2014-11-24 00:20:40 -08:00
Domen Kožar
11a414ddd5 fix eval 2014-11-24 08:57:18 +01:00