Commit graph

70438 commits

Author SHA1 Message Date
Vladimír Čunát
30845d07d8 pcre: separate variants of the library
- don't include the cxx variant in the default build,
  as it depends on libstdc++ (and it seems rarely used anyway)
- allow building pcre16 and pcre32 variants;
  pcre16 is the one needed by qt*, I think
- share the basic libs with all of the variants
2015-10-28 11:50:06 +01:00
Vladimír Čunát
fd1619cf60 yices: use correct static gmp
It still won't build due to trying to use /sbin/ldconfig,
but gmp-related things do seem OK.
2015-10-28 11:50:05 +01:00
Vladimír Čunát
40a973f962 gmp: split dev and info outputs, and disable static
Referrers should have been fixed in previous commits already.
2015-10-28 11:34:45 +01:00
Tuomas Tynkkynen
5f43846d23 gst-plugins-good: Avoid ncurses headers reference
Incredibly, the package doesn't even directly depend on it!
2015-10-28 10:23:04 +01:00
Tuomas Tynkkynen
3d59a8e1a8 ncurses: Fix multiple-output flags
The old way resuts in literal '$(lib)' etc. in the pkg-config files.
2015-10-28 10:23:04 +01:00
Tuomas Tynkkynen
31e1034800 aalib: Split into multiple outputs 2015-10-28 10:23:04 +01:00
Tuomas Tynkkynen
636b823cc1 libcaca: Split into multiple outputs 2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen
58dfef2792 treewide: Fix references to apacheHttpd_2_* 2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen
f302d78d6c apacheHttpd_2_4: Port multiple-output changes from 2.2 2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen
7a68c25baf apacheHttpd_2_2: Remove obsolete cruft 2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen
b81515c2d4 apacheHttpd_2_2: Fix setting installbuilddir
Otherwise mod_dnssd doesn't build.

Also move apxs to $dev.
2015-10-28 10:23:02 +01:00
Vladimír Čunát
311ac81337 gnome-3.18: port missing libgudev dependencies 2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen
4bd5f08bd3 gnome-control-center: Add libgudev
Probably needed after the systemd update.
2015-10-28 10:23:01 +01:00
Tuomas Tynkkynen
cb720e4c94 webkitgtk: Add libXt
It's missing in the multiple-outputs branch for some reason.
2015-10-28 10:23:01 +01:00
Tuomas Tynkkynen
e649ac36da libnl: Split into multiple outputs 2015-10-28 10:23:01 +01:00
Tuomas Tynkkynen
0fe3e37946 php: Apply brute force to locate openldap
Needed after the split to multiple outputs :(. But that's what you get
for not providing pkg-config files...
2015-10-28 10:23:01 +01:00
Tuomas Tynkkynen
b4118c7f04 openldap: Split into multiple outputs
Also fix the incorrect .la file fixups.
2015-10-28 10:23:00 +01:00
Tuomas Tynkkynen
75300c334a cyrus-sasl: Split into multiple outputs
Also fixup .la files to avoid unnecessary -dev dependencies.
2015-10-28 10:23:00 +01:00
Tuomas Tynkkynen
366c1e88fc openldap: Remove dontPatchELF
Everything still seems to build fine.
2015-10-28 10:23:00 +01:00
Vladimír Čunát
c5579c9184 subversion: fixup some referrers after splitting 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
44742f836d apr-util: Split into multiple outputs
Also fixup more .la files to avoid unnecessary -dev dependencies.
2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
55b0097c4c nixos/virtualbox-guest: Reference correct output of xorgserver 2015-10-28 10:22:58 +01:00
Vladimír Čunát
e153b68fce xorg-server: avoid runtime references to xorgserver-dev 2015-10-28 10:22:58 +01:00
Tuomas Tynkkynen
8ec6f85c4e gobject-introspection: Don't delete $out/share/gobject-introspection-1.0/tests
Otherwise breaks pygobject3 compilation.
vcunat added comment. (Commit reordering changed this a bit.)
2015-10-28 10:22:15 +01:00
Tuomas Tynkkynen
db81e22148 treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen
bff9b546e4 nix-prefetch-scripts: Reference correct output of curl 2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen
c7e3ee4153 libXvMC: Split into multiple outputs 2015-10-28 10:17:11 +01:00
Tuomas Tynkkynen
d24bc080f7 libmtp: Split into multiple outputs 2015-10-28 10:17:11 +01:00
Tuomas Tynkkynen
796e36afeb libpng12: Split into multiple outputs 2015-10-28 10:17:11 +01:00
Tuomas Tynkkynen
fb4c2eb438 gnutls: More hacks to .la files
Some .la files contain '-lgmp' without a corresponding -L entry,
breaking e.g. glib-networking and NetworkManager.
2015-10-28 10:17:10 +01:00
Tuomas Tynkkynen
ca2cb493fa fontconfig_210: Split into multiple outputs 2015-10-28 10:17:10 +01:00
Tuomas Tynkkynen
d5c9e1aebe nixos/polkit: Reference correct output of polkit 2015-10-28 10:17:10 +01:00
Tuomas Tynkkynen
1a66da9757 apr-util: Fix path to expat in .la file 2015-10-28 10:17:09 +01:00
Tuomas Tynkkynen
d100218bd2 uwimap: Avoid reference to OpenSSL headers
Default value of SSLCERTS was ${openssl.dev}/certs.
Adjust SSLLIB as well for good measure.
2015-10-28 10:17:09 +01:00
Tuomas Tynkkynen
934a6ddef6 mariadb: Reference correct outputs of zlib and openssl 2015-10-28 10:17:09 +01:00
Tuomas Tynkkynen
e5e2e6aba2 libarchive: Reference correct output of openssl. 2015-10-28 10:17:09 +01:00
Tuomas Tynkkynen
464350aa01 grub2: Patch out GCC reference from modinfo.sh 2015-10-28 10:17:08 +01:00
Tuomas Tynkkynen
fab7d6ea69 nixos/upower: Reference correct output of glib 2015-10-28 10:17:08 +01:00
Tuomas Tynkkynen
0eadc53b4b wget: Remove runtime dependency on OpenSSL headers
It collects compilation and linking flags that are displayed on
`wget --version`. Setting to 0 (NULL) is safe.
2015-10-28 10:17:08 +01:00
Vladimír Čunát
06eba7d320 xorg: remove $man where it was only man3
Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)

The $doc outputs are also development docs (all probably),
but I left those for now.
2015-10-28 10:17:07 +01:00
Vladimír Čunát
6c75f4c9aa imagemagick, soxr, fftw, libraw: remove explicit gcc.lib
It is no longer needed after cc-wrapper fixes.
2015-10-28 10:17:07 +01:00
Vladimír Čunát
8adabe6679 gawk: split $doc into $man and $info
Info files are rather large and not much used anymore, AFAIK.
(We include $man or $doc in the system closure by default.)
2015-10-28 10:16:55 +01:00
Vladimír Čunát
efcad4c910 gcc5: split $doc into $man and $info
... because cc-wrapper is meant to propagate man pages into user envs,
and info pages are rather large.

Also replace the duplicate g++ and gcc man1 pages by a symlink.
2015-10-28 10:15:55 +01:00
Vladimír Čunát
55d129609d cc-wrapper: correct ccLDFlags with multiple outputs
Note: -B argument seems more like for gcc's main output,
though it's used in a bit strange way here.
(Upstream default is /usr/lib/gcc/ which we don't move.)
2015-10-28 10:15:54 +01:00
Vladimír Čunát
cd7a78d7e4 cc-wrapper: fix typo ignoring flags; fixes #10574 2015-10-28 10:15:54 +01:00
Vladimír Čunát
64cdc48d1d stdenv/multiple-outputs: add REMOVE target, use for docdev
Now any developer docs are removed by default, unless "docdev"
is in $outputs or $outputDocdev is defined.
Currently devdoc consists of just man3 and gtk-doc.
2015-10-28 10:15:54 +01:00
Vladimír Čunát
689d9757c5 stdenv/multiple-outputs: autoremove empty directories
i.e. remove chains of empty dirs after moving contents out of them.
2015-10-28 10:15:53 +01:00
Vladimír Čunát
5d862db694 libmng: split dev and docdev outputs 2015-10-28 10:15:53 +01:00
Vladimír Čunát
74d4fc7959 graphviz: simplify and add a missing X library 2015-10-28 10:15:52 +01:00