1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 21:17:46 +00:00
Commit graph

240 commits

Author SHA1 Message Date
Tuomas Tynkkynen 2f50cfe25f qt5: Shuffle outputs
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Thomas Tuegel 43bf5d2c30 Merge pull request #18052 from loskutov/master
Qt5: Enable Wayland support
2016-08-28 07:38:23 -05:00
Thomas Tuegel b8a83d901f qt5: use absolute paths to plugins in CMake
This reverts commit 17f9b21c09.

This is a partial unrevert. Qt 5.6 and Qt 5.7 remain building and
working. Qt 5.5 stays building but broken.
2016-08-28 07:33:42 -05:00
Moritz Ulrich 17f9b21c09 Revert "qt5: use absolute paths to plugins in CMake"
This reverts commit 7a9e04943d.

The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
2016-08-28 12:29:20 +02:00
Ignat Loskutov cc83045026 Qt5: Enable Wayland support 2016-08-28 00:57:43 -04:00
Thomas Tuegel 7a9e04943d
qt5: use absolute paths to plugins in CMake
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Thomas Tuegel f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions 2016-08-25 10:07:03 -05:00
Thomas Tuegel dedc6716e4 qt5: build without -reduce-relocations
Fixes #17862.
2016-08-20 17:36:32 -05:00
Nikolay Amiantov e3039a282a qt5.qtwebkit: set myself as a maintainer 2016-08-17 22:46:24 +03:00
Nikolay Amiantov c1262a76e4 qt5.qtwebkit: use gstreamer backend
It's recommended by upstream: https://bugs.webkit.org/show_bug.cgi?id=63472
2016-08-17 20:20:35 +03:00
Nikolay Amiantov 13fdb45c04 qt57.webkit: init at 5.7.0 2016-08-17 20:20:35 +03:00
Nikolay Amiantov 306358992a qt56.webkit: init at 5.6.1 2016-08-17 20:20:35 +03:00
Nikolay Amiantov b14f6a96f6 qt55: regenerate srcs 2016-08-17 20:20:35 +03:00
Nikolay Amiantov 58202a9113 qt fetchsrcs.sh: add community releases
Also parametrize by version and make more reproducable.
2016-08-17 20:20:35 +03:00
Thomas Tuegel ca5b3368ca qttools: fix CMake paths
Fixes #17585.
2016-08-08 08:52:45 -05:00
Thomas Tuegel 307847e6fa Merge pull request #17369 from ttuegel/qt-5.7
qt57: init at 5.7.0
2016-07-29 18:12:38 -05:00
Thomas Tuegel 839a543d41 qt57: init at 5.7.0 2016-07-29 17:46:13 -05:00
michael bishop dd3e27f2e7 qt56: purge all refrences to gtk, solves all of the theme problems 2016-07-29 18:50:06 -03:00
Thomas Tuegel add332c424 qt55: fix CMake module paths 2016-07-28 18:26:54 -05:00
Thomas Tuegel 6ef6c5a6f6 qt55: add missing module setup hook 2016-07-19 12:36:09 -05:00
Thomas Tuegel 6dc6ae0ebe qt55.qtlocation: don't try to wrap missing module 2016-07-17 06:58:15 -05:00
Thomas Tuegel 343415e02e qt55.qtbase: fix setup hook and QMake hook 2016-07-16 15:02:19 -05:00
Thomas Tuegel 78e7f44488 qt5.makeQtWrapper: do not inherit Qt search paths 2016-07-16 10:14:50 -05:00
Thomas Tuegel 766ea7c4ca qt55.qtbase: update setup hook 2016-07-16 10:14:45 -05:00
Thomas Tuegel d19dc420d2 qt56.qtbase: don't use propagatedUserEnvPkgs
Fixes #15498.
2016-07-16 10:14:44 -05:00
Jos van den Oever 3d0e582b38 qtwebengine init at 5.6.1-1 2016-06-26 23:02:54 +02:00
Jos van den Oever 7aa1caa4d3 qtwebchannel init at 5.6.1-1 2016-06-26 23:01:42 +02:00
Jos van den Oever af62c6123a qt56: 5.6.1 -> 5.6.1-1 2016-06-26 20:07:31 +02:00
Tobias Geerinckx-Rice 6669fac77e
qt55.qtbase: remove unused dlopen-gtkstyle.patch 2016-06-23 12:13:24 +02:00
Thomas Tuegel ed46b468b0 Fix Travis build failure caused by Qt/KDE documentation
The comments in the Qt/KDE packages caused a spurious Travis build
failure because they appeared to refer to `<nixpkgs>`.
2016-06-17 12:21:19 -05:00
Thomas Tuegel 592dcbc4bf Fix evaluation error in Qt/KDE packages
For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
2016-06-17 09:47:16 -05:00
Thomas Tuegel e39f696d06 qt56: store generated source hashes outside Nixpkgs tree 2016-06-16 15:16:49 -05:00
Thomas Tuegel e6fdc9f7f0 Merge pull request #16092 from abbradar/qt561
Qt: 5.6.0 -> 5.6.1
2016-06-09 14:32:53 -05:00
Nikolay Amiantov 97d791978c qt56: 5.6.0 -> 5.6.1 2016-06-09 18:44:56 +03:00
Thomas Tuegel de842765be qt56.qtbase: propagate build inputs correctly 2016-06-09 09:14:06 -05:00
Nikolay Amiantov 693b49166a qt5: remove gtkStyle option
It's no more needed now that we split QGtkStyle plugin
into separate output.
2016-06-03 19:14:52 +03:00
Thomas Tuegel b2df0a10d9 qt56.qtbase: patch CMake module paths 2016-06-01 09:35:39 -05:00
Thomas Tuegel d423a36aa5 Revert "qt56.qtbase: apply CMake setup-hook fix locally"
This reverts commit 6b6f067397.
2016-06-01 07:02:47 -05:00
Thomas Tuegel 6b6f067397 qt56.qtbase: apply CMake setup-hook fix locally 2016-05-31 20:48:13 -05:00
Thomas Tuegel ca34e075e4 qt56.qtbase: create symlink farm in one pass 2016-05-31 13:02:14 -05:00
Thomas Tuegel e0d03c43bf qt56: make symlink farm for CMake builds like QMake 2016-05-30 16:29:41 -05:00
Thomas Tuegel 95c5bfc2dc qt55.qmakeHook: remove temporary directory in postInstall
Fixes #15556. If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-29 14:07:03 -05:00
Thomas Tuegel 747517da48 qt56.qmakeHook: remove temporary directory in postInstall
Fixes #15556. If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-28 16:06:03 -05:00
Vladimír Čunát c2ee8e1033 qt56.qtbase: fix evaluation on darwin
/cc @ttuegel.
Maybe there's a better way; I didn't want to spend much time.
2016-05-20 12:48:50 +02:00
Thomas Tuegel d22df66c54 qt56: remove fixQtModuleCMakeConfig 2016-05-11 10:19:28 -05:00
Thomas Tuegel b63899c42f qt55.qmakeHook: fix static library relocation 2016-05-09 10:01:07 -05:00
Thomas Tuegel 62d07ae7d4 qt56.qttools: add qtdeclarative dependency 2016-05-09 10:01:07 -05:00
Thomas Tuegel 0903faa3fb qt56.qmakeHook: fix static library relocation 2016-05-09 10:01:06 -05:00
Thomas Tuegel 7c77230224 Remove Qt 5.4.2 2016-05-09 10:01:04 -05:00