Tuomas Tynkkynen
34922a3951
python2: Fix on non-Linux
...
The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
2016-02-13 16:03:55 -05:00
Tuomas Tynkkynen
78e62da7f1
python2: Fix on Darwin
...
Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
2016-02-13 15:52:23 -05:00
Tuomas Tynkkynen
0cd08e7e02
HACK: darwin adv_cmds: Add a dummy 'out' output
2016-02-13 15:50:20 -05:00
Dan Peebles
0a23d430bf
stdenv-darwin: fix to work with multiple outputs
2016-02-13 15:48:22 -05:00
Dan Peebles
6f2ab634f9
bzip2: fix shared library generation on darwin
...
This fixes #6504
(cherry picked from commit 31ab7d38f2
2016-02-13 17:20:44 +01:00
Thomas Tuegel
5a13e9500c
nixos/nix-serve: use bzip2.bin output
2016-02-07 18:38:00 -06:00
Thomas Tuegel
c8577b9f30
haskell-double-conversion: add libstdc++ to inputs
2016-02-05 14:26:01 -06:00
Tuomas Tynkkynen
1085701293
gnutar: Depend on 'acl' only on Linux
...
I'm not sure why but the 'acl' dependency only exists in the
multiple-outputs branch...
2016-02-03 17:33:18 +01:00
Vladimír Čunát
54299b60c4
Merge #12779 : Mass replace pkg}/bin-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
824c8dfa95
add ensureNewerSourcesHook and apply to all python
...
Fixes #12663 : problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.
(cherry picked from staging commit e4ab8aee62
2016-02-03 17:11:17 +01:00
Vladimír Čunát
d3a3aa8674
Merge #12740 : multiple outputs for Qt 5 and KDE 5
2016-02-03 17:09:09 +01:00
Vladimír Čunát
2c51a075ab
makeFontsConf: fix with multiple outputs
2016-02-03 16:57:41 +01:00
Vladimír Čunát
bd2ca1e539
libvdpau: fixup branch interactions
...
This solution is cleaner anyway.
2016-02-03 16:57:41 +01:00
Vladimír Čunát
f89a136fd5
cc-wrapper: fixup branch interactions
...
c0599fdd61
2016-02-03 16:57:41 +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
Tuomas Tynkkynen
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5dfcafb205
treewide: Mass replace 'xwayland}/bin' to refer the 'out' output
2016-02-01 20:46:27 +02:00
Tuomas Tynkkynen
33e7a2549a
treewide: Mass replace 'xfsprogs}/bin' to refer the 'bin' output
2016-02-01 20:46:23 +02:00
Tuomas Tynkkynen
7b0c4d452a
treewide: Mass replace 'poppler_utils}/bin' to refer the 'out' output
2016-02-01 20:46:18 +02:00
Tuomas Tynkkynen
13b3f3f246
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
2016-02-01 20:46:16 +02:00
Tuomas Tynkkynen
3cc7fa0be9
treewide: Mass replace 'lzma}/bin' to refer the 'bin' output
2016-02-01 20:46:15 +02:00
Tuomas Tynkkynen
0eb84e882b
treewide: Mass replace 'libjpeg}/bin' to refer the 'bin' output
2016-02-01 20:46:10 +02:00
Tuomas Tynkkynen
76cfa449dc
treewide: Mass replace 'flac}/bin' to refer the 'bin' output
2016-02-01 20:46:02 +02:00
Tuomas Tynkkynen
9700be4381
treewide: Mass replace 'djvulibre}/bin' to refer the 'bin' output
2016-02-01 20:46:00 +02:00
Tuomas Tynkkynen
a4dff4bf1b
treewide: Mass replace 'dbus_daemon}/bin' to refer the 'out' output
2016-02-01 20:45:59 +02:00
Tuomas Tynkkynen
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
Tuomas Tynkkynen
9782c593ed
treewide: Mass replace 'acl}/bin' to refer the 'bin' output
2016-02-01 20:45:55 +02:00
Nikolay Amiantov
53e0f8b1cd
Merge branch 'fontconfig-caches' into staging
...
Closes #12668 , fixes #12648
2016-02-01 12:20:06 +03:00
Nikolay Amiantov
b64ca73b81
Merge remote-tracking branch 'nckx/update-freetype' into staging
...
Closes #12600
2016-02-01 12:18:02 +03:00
Thomas Tuegel
f43eb5ece0
qt54.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4768f41e36
nixos/kde5: use runtime outputs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db419ce555
sddm: remove bash-ism
2016-01-31 21:15:03 -06:00
Thomas Tuegel
29e2b511db
sddm: link theme runtime outputs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6c327da007
kde5.kservice: remove redundant propagatedUserEnvPkgs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
98aa081812
kde5.breeze-icons: remove redundant propagatedUserEnvPkgs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7ae370fa3
kde5.plasma-workspace: propagate inputs automatically
2016-01-31 21:15:03 -06:00
Thomas Tuegel
30d6a71995
kde5.plasma-workspace: remove redundant propagatedUserEnvPkgs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
7b11d5066a
kde5.plasma-desktop: remove redundant propagatedUserEnvPkgs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a5b7cf0939
kde5.kscreen: remove redundant propagatedUserEnvPkgs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
7ea3225ea4
kde5.breeze: use runtime outputs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
588c8499f7
qt55: don't set output flags by default
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2efbf665a3
qt55.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
fe1bae4e58
spotify: udev -> libudev
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f4087b13d
google-talk-plugin: udev -> libudev
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0c79c7c3b2
qt54.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6e623f8784
qt54.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b3c8878a65
qt54.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7cce8b329
qt54.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d769d6c3bd
qt54.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f0ec07921
qt54.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
