1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:48:10 +00:00
Commit graph

343 commits

Author SHA1 Message Date
Vladimír Čunát 515414ed32
Merge branch 'master' into staging 2017-05-16 18:32:43 +02:00
Vladimír Čunát f5c568446a
qtwebkit-*: fix #25585: bad RPATH entries 2017-05-16 18:30:58 +02:00
Thomas Tuegel fabd48272f
Merge branch 'qt--qpa-plugin-path' 2017-05-14 13:55:42 -05:00
Thomas Tuegel 7c338b7df8
qtbase: search platform plugin paths before other plugin paths 2017-05-14 13:55:03 -05:00
Thomas Tuegel 88a5082edf
Revert "qt58: ignore NIX_PROFILES environment variable"
This reverts commit 6169bd98f5.
2017-05-14 13:55:02 -05:00
Periklis Tsirakidis 096c008036 Fix #25723: Remove old GNU libstdc++ for qtbase 2017-05-14 09:46:38 +02:00
Thomas Tuegel 2716e5bd80
qt58.qtbase: cleanup: sort attributes 2017-04-28 05:54:29 -05:00
Thomas Tuegel 9f00e2be18
qt58.qtbase: fix warnings in TZDIR patch 2017-04-28 05:54:28 -05:00
Thomas Tuegel 64418af8c5
qt58.qtbase: fix developer build 2017-04-28 05:54:22 -05:00
Thomas Tuegel 52ac15953e
makeQtWrapper: prefix Qt search paths 2017-04-28 05:54:21 -05:00
Thomas Tuegel 577c4f543b
qt58.qtbase: remove D-Bus library paths patch
Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel 5735edb894
qt58.qtbase: remove OpenSSL library paths patch
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel 0d0858202c
qtbase: unify Linux and Darwin patchsets 2017-04-28 05:54:17 -05:00
Thomas Tuegel 4bd911dcd6
qtbase: fill in configure flags 2017-04-28 05:54:17 -05:00
Thomas Tuegel 3062080572
qt58.qtbase: remove SSL decryption patch
This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
2017-04-28 05:54:16 -05:00
Thomas Tuegel a579e0129c
qt58.qtbase: clean up configuration 2017-04-28 05:54:16 -05:00
Thomas Tuegel e4fb41cc5b
qt58.qtbase: clean up CMake path sed scripts 2017-04-28 05:54:15 -05:00
Thomas Tuegel 9d9ab3de98
qt58.qtbase: replace mkspecs patch with sed script 2017-04-28 05:49:35 -05:00
Thomas Tuegel 1f62bf01d3
qt58.qtbase: Fix path to fallback libGL 2017-04-28 05:49:35 -05:00
Thomas Tuegel 8e2b6a90c0
qt58.qtbase: Fix path to libdbus 2017-04-28 05:49:35 -05:00
Thomas Tuegel f45f2635e1
qt58.qtbase: Fix path to libssl and libcrypto 2017-04-28 05:49:34 -05:00
Thomas Tuegel ff8fa7e397
qt58.qtbase: Fix path to libXcursor 2017-04-28 05:49:34 -05:00
Thomas Tuegel 40aa757898
qt58.qtbase: Fix path to libresolv 2017-04-28 05:49:34 -05:00
Thomas Tuegel 6169bd98f5
qt58: ignore NIX_PROFILES environment variable 2017-04-28 05:49:34 -05:00
Thomas Tuegel 12c981d4b7
qt58.qtbase: Fix QTCOMPOSE search patch 2017-04-28 05:49:34 -05:00
Thomas Tuegel 2ce3fe0a71
qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH
The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
2017-04-28 05:49:34 -05:00
Thomas Tuegel 44eb84feb6
qt58.qtbase: Update patch offsets 2017-04-28 05:49:34 -05:00
Dan Peebles 9046e54f6d qt5: fix to work on LLVM 4
(this is reapplying 6b1957d17a, which got
lost in a merge)

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-25 09:37:36 -04:00
Nikolay Amiantov ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03:00
Periklis Tsirakidis 775531c1e3 qt58: extend darwin compatibility 2017-04-08 09:54:46 +02:00
Dan Peebles 6b1957d17a qt5: fix to work on LLVM 4
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00
Ambroz Bizjak 195efedd2c qt58: Fix path to qhelpgenerator in cmake file.
It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
2017-04-02 11:21:34 +02:00
Thomas Tuegel 3dc1a4ba8b
Remove Qt 5.5
The community support window for Qt 5.5 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:40 -05:00
Thomas Tuegel b4e6351c78
Remove Qt 5.7
The community support window for Qt 5.7 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:37 -05:00
Periklis Tsirakidis b97dd5f560 qt58: enable darwin compatibility 2017-03-25 09:48:17 +01:00
Robin Gloster dd385d9468
qt57.makeQtWrapper: fix eval 2017-03-24 18:20:01 +01:00
Nikolay Amiantov f45cf10f6e Merge pull request #24133 from abbradar/gtk3-qt
Fix GTK dependencies in wrappers
2017-03-24 01:49:41 +03:00
Baptist BENOIST 7d72b9b74e Remove bbenoist from maintainers
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
Nikolay Amiantov 040b86a96e qt5.qtwebengine: use system libraries where possible
Fixes #23987.
2017-03-23 00:03:33 +03:00
Nikolay Amiantov 3a948e6b07 qt5.qtwebengine: add proprietary codecs support 2017-03-23 00:03:33 +03:00
Nikolay Amiantov a7a858aa52 qt5.qtwebengine: patch more library paths
Adapted from chromium derivation. Fixes qutebrowser crash.
2017-03-23 00:00:50 +03:00
Nikolay Amiantov a40b7d07e9 makeQtWrapper, kdeWrapper: add GTK3 dependencies 2017-03-22 20:15:32 +03:00
Thomas Tuegel 7aee677a10
makeQtWrapper: wrap with runtime XDG dirs 2017-03-22 07:44:05 -05:00
Nikolay Amiantov dec8fb077f qt5.qtwebengine: fix library paths
Without this it would try to find files in qtbase

Ported to Qt 5.8.
2017-03-22 01:38:04 +03:00
Orivej Desh 583e862d11
qtbase-* nitpick: fix list nesting
Generalized from #24036, and leaving the authorship there.
2017-03-19 11:03:51 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
michael bishop db05f414bd
qtmultimedia-5.7: disable alsa on darwin 2017-03-16 23:15:44 -03:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
Bjørn Forsman db937b9d60 qt57.full: add missing modules
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
2017-03-14 22:27:20 +01:00
Bjørn Forsman 961c73a78c qt56.full: add missing modules
qtquickcontrols2, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).

(The qt55 expression already has all modules in *full.)
2017-03-14 22:27:20 +01:00