1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

76038 commits

Author SHA1 Message Date
Thomas Tuegel 6c37bebabd qt55.qtdeclarative: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6dfabcb47b qt55.qtscript: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 8bfae5c46d qt55.qtbase: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel ac5a585ed8 qt55: add fixQtModuleCMakeConfig setup hook 2016-01-31 21:15:03 -06:00
Thomas Tuegel a27a4c29ad extra-cmake-modules: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 1087020a46 cmake: invoke configure hooks correctly
Otherwise, the multiple-outputs hooks will not fire correctly.
2016-01-31 21:15:03 -06:00
Thomas Tuegel 4465f438de qt55: improve update documentation 2016-01-31 21:15:03 -06:00
Thomas Tuegel a6c9a6f5bf qt55.qtbase: set licenses correctly 2016-01-31 21:15:03 -06:00
Thomas Tuegel 9adcd6f78c qt55: update homepage 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6dda0824ba qt55.qtbase: use -system-harfbuzz 2016-01-31 21:15:03 -06:00
Thomas Tuegel 74121e07a7 qt55: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel db69888a02 qt55.qtbase: disable documentation
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:15:03 -06:00
Thomas Tuegel 3cfb552bbc qt55.qtbase: don't depend on makeWrapper 2016-01-31 21:15:03 -06:00
Thomas Tuegel 302450dbfe qt55.qtbase: don't propagate extra Mesa dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel e64822b87d qt55.qtbase: don't propagate gtk dependencies 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4b844747a2 qt55.qtbase: don't propagate postgresql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel d5d7554639 qt55.qtbase: don't propagate mysql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel 5337a2a4b3 qt55.qtbase: don't propagate cups dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel fcf290cd1d qt55.qtbase: don't refer to .dev outputs at runtime 2016-01-31 21:15:03 -06:00
Thomas Tuegel 0055c6aa94 qt54: use multiple outputs 2016-01-31 21:14:24 -06:00
Thomas Tuegel d8a08fff90 qt54: disable documentation
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 67d5a026ca qt54.qtbase: don't propagate makeWrapper dependency
I have no idea how it even got here; it's certainly not necessary!
2016-01-31 21:14:24 -06:00
Thomas Tuegel 4ed8d5d125 qt54.qtbase: don't propagate extra Mesa dependency
The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
2016-01-31 21:14:24 -06:00
Thomas Tuegel a6fd9e9be6 qt54.qtbase: don't propagate gtk dependencies
It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel b0753cec2a qt54.qtbase: don't propagate postgresql dependency
It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 5fb4e3b338 qt54.qtbase: don't propagate mysql dependency
It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel c1f0f62a9c qt54.qtbase: don't propagate cups dependency
It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel 66d76f8b5b qt54.qtbase: don't rever to .dev outputs at runtime 2016-01-31 21:14:24 -06:00
Vladimír Čunát c979012631 man-only packages: fixup after stdenv changes
Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
2016-01-28 13:55:37 +01:00
Vladimír Čunát 363f667e8b qt5*.qtbase: fixup output references
Hopefully I haven't missed any references in qt5*.
2016-01-28 13:31:17 +01:00
Vladimír Čunát 2cc537bd06 Merge #11597: various multiple-output fixes 2016-01-28 13:05:30 +01:00
Vladimír Čunát 66365b76dd Merge #12607: mass-replace 'pkg}/lib'-style references
... in strings to point to correct outputs.
2016-01-28 12:57:30 +01:00
Vladimír Čunát a33fcc8731 cc-wrapper: attempt to fix on darwin
This fixes evaluation at least. I'm unable to test this myself and noone steps up;
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-174448705
however, Hydra's macs are idling so let's employ them for that.
2016-01-28 06:59:36 +01:00
Alexander V. Nikolaev 61020943d1 syslog-ng: add explicit pcre build dependency 2016-01-27 15:37:19 +02:00
Alexander V. Nikolaev c53e932e5b fvwm: Missing libXt build input 2016-01-27 15:37:13 +02:00
Alexander V. Nikolaev f07a7fc5fd qtile: dlopen'able path now are in "out", not "dev" 2016-01-26 23:01:05 +02:00
Alexander V. Nikolaev dc1f06bc47 Use "out", not "dev" for dlopen'able libraries 2016-01-26 23:01:05 +02:00
Tuomas Tynkkynen fdae7816e3 openttd: Fixup static zlib path 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen 0f4244f51f treewide: Mass replace 'poppler_utils}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen 619710268d treewide: Mass replace 'poppler}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen ba87da9fd1 treewide: Mass replace 'pcre}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 2258aecaa5 treewide: Mass replace 'nss}/lib' to refer the 'out' output 2016-01-24 10:03:38 +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 04c5830432 treewide: Mass replace 'mpfr}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 1894615f64 treewide: Mass replace 'xorg.libXrender}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 474f921bac treewide: Mass replace 'xorg.libXrandr}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 5a6a8213eb treewide: Mass replace 'xorg.libXinerama}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00