Commit Graph

39 Commits

Author SHA1 Message Date
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Alexander V. Nikolaev
e94cd63bf5 treewide: transition libGL/libGLU for qt
Also rename mesaSupported to libGLSupported
2018-02-24 17:06:49 +02:00
Bjørn Forsman
09cf3506fa qt5X.full: add "-full" to package name
This aligns the package name more with the attrname.

This is a re-application of the idea behind 7405af72e6
("qt: make package names of "full" variants appear as such"), which
seems to have been lost on the way.
2018-02-18 14:44:16 +01:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null 2018-01-20 09:10:57 -06:00
Will Dietz
42b84057a4 qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait
Based on:
4e8083b4ab

Fixes mendeley bug mentioned in #33396,
which links to related issues in other distributions and upstream Qt.
2018-01-04 13:08:51 -06:00
Orivej Desh
031367af2b qt56.qtwebengine: fix build
Delete the patch, it has been integrated into Qt 5.6.3.
2017-11-17 02:51:58 +00:00
Thomas Tuegel
fe0ab944db
qt5: factor out common definitions and remove symlink farm
The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
2017-11-07 07:18:46 -06:00
Thomas Tuegel
d9f29afa64
qt5: use one output by default 2017-06-18 08:44:43 -05:00
Thomas Tuegel
6fa41788be
qt5: separate plugins from libraries 2017-06-18 08:44:42 -05:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel
1607f51613
qmake: unify Darwin and Linux setup hooks 2017-06-18 08:43:39 -05:00
Thomas Tuegel
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel
3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05: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
Thomas Tuegel
e8ad7f0570
qt5: Add compatibility attribute for qtquick1 2017-02-27 11:50:03 -06:00
Thomas Tuegel
e21b5da630
qt56.qtquickcontrols2: init at 5.6.2 2017-02-27 11:49:37 -06:00
Thomas Tuegel
490bbb288e
qt56: Update instructions 2017-02-27 11:49:32 -06:00
Thomas Tuegel
4f2e7a0424
Separate Qt 5 packages from dependent libraries 2017-02-27 11:49:04 -06:00
Anthony Cowley
7a9400d338 qt5.6: darwin compatibility
- qtbase builds on darwin
- Downstream qmake and cmake build configurations supported

Darwin-specific changes:

Prevent `qmake -project` from adding build support files in the temp
directory to the project.

Shrink the temp directory used for building with qmake.

The issue here is that `lndir` recreates the entire directory structure
of the module we are merging into the temporary build environment. On
darwin, the framework directory structures mean that this shadow
directory tree is 17MB even though the file contents are all symlinks
into the store.

To address this, we symlink the framework directories explicitly and
use `lndir` for everything else.
2016-12-08 18:28:30 -05:00
Thomas Tuegel
7b05efb90d
qt5: factor out common makeQtWrapper setup hook 2016-12-03 09:57:17 -06:00
Thomas Tuegel
2c4995c013
qt5: factor out common qmake setup hook 2016-12-03 09:55:39 -06:00
Thomas Tuegel
53a694e096
qt5: factor out common qtSubmodule setup hook 2016-12-03 09:53:18 -06:00
Jos van den Oever
1fb5a9b708 qt5: Add qtwebengine and qtwebchannel to qt5.full 2016-11-22 20:48:11 +01:00
Me
bd0ffa50aa qt56.qtwebengine: chromium clang update.py patch
Add patch to the clang update.py script for chromium that makes it work
the same as in qt57.qtwebengine. This avoids issues with the
subprocess.call that is used to run update.sh not liking the path it is
passed in certain build enviroments. update.sh is no longer used.
2016-11-04 14:09:09 -08:00
Tuomas Tynkkynen
6563cd34d8 qt5.6, qt5.7: Use dev output of qtbase in setupHook 2016-08-31 15:23:24 +03:00
Tuomas Tynkkynen
2f50cfe25f qt5: Shuffle outputs
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Ignat Loskutov
cc83045026 Qt5: Enable Wayland support 2016-08-28 00:57:43 -04:00
Nikolay Amiantov
306358992a qt56.webkit: init at 5.6.1 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
michael bishop
dd3e27f2e7 qt56: purge all refrences to gtk, solves all of the theme problems 2016-07-29 18:50:06 -03: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
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
e0d03c43bf qt56: make symlink farm for CMake builds like QMake 2016-05-30 16:29:41 -05:00
Thomas Tuegel
d22df66c54 qt56: remove fixQtModuleCMakeConfig 2016-05-11 10:19:28 -05:00
Thomas Tuegel
ea90e3e6ca qt56: init at 5.6.0 2016-05-09 10:01:03 -05:00