Commit Graph

60804 Commits

Author SHA1 Message Date
Vladimír Čunát
328eafa885 gnutls: split into multiple outputs
Fixed all 'gnutls}' references, too.
2015-10-05 11:07:54 +02:00
Vladimír Čunát
252b3dcc87 unbound: split into multiple outputs 2015-10-05 10:53:30 +02:00
Vladimír Čunát
68530a4fb7 dbus-glib: split into multiple outputs
Fixed all 'dbus_glib}' references too.
2015-10-05 10:51:22 +02:00
Vladimír Čunát
c817263b0c plasma53.breeze: fix missing automoc4
I don't know why/when it started missing.
2015-10-04 17:34:29 +02:00
Vladimír Čunát
374e657193 kdelibs-*: fix missing pcre
I don't know why/when it started missing.
2015-10-04 14:55:47 +02:00
Vladimír Čunát
a0581b1e74 kde-gtk-config-*: fix with multiple outputs 2015-10-04 14:54:57 +02:00
Vladimír Čunát
551cce01ff network-manager: fix build after udev changes
It's missing libsystemd-login but only `udev` was in inputs...
2015-10-04 13:13:46 +02:00
Vladimír Čunát
861debbf9f phonon_qt5_backend_gstreamer: hack-fix build 2015-10-04 13:08:28 +02:00
Vladimír Čunát
afd37d9251 boost-1.55: fix build with gcc-5 by upstream patch
Our higher versions have fix integrated upstream.

(cherry picked from commit 4e8da0747c88375c221bf1b0f060183a863c6851)
2015-10-04 12:36:21 +02:00
Vladimír Čunát
b2e73c81d9 media-player-info: fix build missing udev
I don't know what it actually needs, but it's satisfied by systemd.
2015-10-04 11:59:15 +02:00
Vladimír Čunát
40e4ab37cf wildmidi: fix build 2015-10-04 11:47:52 +02:00
Vladimír Čunát
d0f72e729a libav: fix with multiple outputs and improve splitting 2015-10-04 11:29:37 +02:00
Vladimír Čunát
0cf11036b4 texlive.bin.core: fixup with multiple outputs
There was an interaction with hand-moving the docs.
2015-10-04 11:08:18 +02:00
Vladimír Čunát
1004d44d80 llvm-3.7: fix build by -lpthread
This is strange. Morover, 3.6 builds fine without modifications.
2015-10-04 10:16:34 +02:00
Vladimír Čunát
7434b8c29f mesa: fixup with multiple outputs 2015-10-04 10:03:55 +02:00
Vladimír Čunát
2323d70d88 all-packages: revert accidentally committed change 2015-10-04 10:03:54 +02:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
ec7a4ddd92 all-packages: fix openssl_* reference
(cherry picked from commit 976b1dd423ac73eb29a20de84f1a5b79da4dd5bb)
2015-10-04 09:49:42 +02:00
Vladimír Čunát
54eef65533 libcap*: fix with multiple outputs
I don't think we need the license file in each of these,
so I only left it with the library (it isn't big).
2015-10-04 09:49:19 +02:00
Vladimír Čunát
c83b59130f libsodium: fix build by removing -lssp
There seems no reason why it should be there anyway.
/cc maintainers: @raskin, @viric, @wkennington.
2015-10-03 19:02:13 +02:00
Vladimír Čunát
32a5deb455 libffi: fixup libffi.pc, and refactor 2015-10-03 17:07:49 +02:00
Vladimír Čunát
c071e4aab4 planetary-annihilation: fixup to use multiple-output paths
Hopefully... there are way too many similar references everywhere.
2015-10-03 16:49:36 +02:00
Vladimír Čunát
c8d9e2fb67 orc: split dev stuff, and refactor meta 2015-10-03 16:48:44 +02:00
Tuomas Tynkkynen
ad1eb36dac binutils: Don't use multiple-outputs when cross compiling 2015-10-03 16:43:23 +02:00
Tuomas Tynkkynen
77580d42ad php: Enable SSL via buildInputs
The old way doesn't seem to work with multiple outputs.
TODO: this seems to be a recurring pattern with openssl, maybe the
splitting isn't done correctly?
2015-10-03 16:42:46 +02:00
Vladimír Čunát
1858a39c9a apr: don't manually move apr-1-config
Also refactor meta.
2015-10-03 16:41:51 +02:00
Vladimír Čunát
9d19ac7d0d apparmor: fixup to use some multiple-output paths 2015-10-03 16:37:26 +02:00
Tuomas Tynkkynen
753cfbe09b libXmu: Split into multiple outputs
We need to override BITMAPDIR, since the default:
    -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.

(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
2015-10-03 16:36:21 +02:00
Vladimír Čunát
2f7568e092 guile: fixup with multiple-output libtool 2015-10-03 16:34:00 +02:00
Vladimír Čunát
9fbb83b467 openssl: fixup after merge 2015-10-03 16:28:39 +02:00
Vladimír Čunát
b1a38cd40d nodejs: fixup 2015-10-03 16:28:06 +02:00
Vladimír Čunát
cf7163f6f4 rustc: re-add missing file from staging
I'm not sure why it has disappeared.
Also try to fixup with multiple-output changes.
2015-10-03 16:27:04 +02:00
Vladimír Čunát
f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
f2cb132c34 libtiff: fixup 2015-10-03 14:37:35 +02:00
Vladimír Čunát
8c811ea13a jasper: fixup 2015-10-03 14:37:07 +02:00
Tuomas Tynkkynen
837c104512 perl: Port multiple-output changes from 5.16 to 5.20 and 5.22 2015-10-03 14:34:13 +02:00
Tuomas Tynkkynen
0da9c49303 autogen: Split into multiple outputs
In particular, this avoids runtime-depending on guile.
2015-10-03 14:08:55 +02:00
Tuomas Tynkkynen
09637ac363 kernel: Don't propagate the dev output
The current default multiple-output propagation rules don't seem to work
too well if the dev output isn't the first one; without this we get an
unnecessary runtime reference to the kernel headers.
2015-10-03 14:08:55 +02:00
Tuomas Tynkkynen
54dcadad6c librsvg: Reference correct output of gdk_pixbuf 2015-10-03 14:08:54 +02:00
Tuomas Tynkkynen
7cd13b9003 apache-httpd: Enable SSL via buildInputs
The old approach doesn't seem to work with multiple outputs.
2015-10-03 14:08:53 +02:00
Tuomas Tynkkynen
0b5353b319 kbd: Reference correct output of bzip2 2015-10-03 14:08:52 +02:00
Tuomas Tynkkynen
331aee2a61 slim: Add glibc as build input
I don't know why this is needed, but other cmake packages seem to need
this as well.
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
0100b27069 imake: Add uberhack to workaround broken 'gcc -x c'
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)

What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
0054c8aa5a python3: Use correct build inputs for multi-output deps
Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.

vcunat added python-3.5.
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
4be9702fe0 libffi: Don't manually move lib64 stuff
It breaks the i686 build. TODO: test that this doesn't break x86_64 ;)
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
947542be6d libxft: Fix reference to incorrect output 2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
a39f5839ea groff: Fix multiple-output build 2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
15471a8659 gcc: Do bootstrapped compilation on MIPS and ARM as well
Since the multiple-output changes building a non-bootstrapped gcc
doesn't work anymore. TODO: also test if cross compilation is broken
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
bd028b24bb gcc 4.9: Fix multi-out fixups
- $out/libexec/ now contains subdirectories that we want to patchelf too
- $out/libexec/ now contains some .so and a related .la file, which must
  not be passed to patchelf
2015-10-03 14:08:49 +02:00
Tuomas Tynkkynen
8a460bf953 gcc 4.8, 4.9: Revert conflicting info output 2015-10-03 14:08:49 +02:00