Commit graph

101 commits

Author SHA1 Message Date
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 2063d54c72
qt56: 5.6.2 -> 5.6.3 2017-11-12 09:51:48 -06:00
Thomas Tuegel 4f72831934
qt56.qtbase: replace type with command for POSIX compatibility 2017-11-12 09:51:47 -06:00
Thomas Tuegel 9e05d61dd7
qt56: remove unused obsolete expressions 2017-11-12 09:51:47 -06:00
Thomas Tuegel 91b362c5cf
qt56.qtwebkit: fix build with ICU 59 2017-11-12 09:51:47 -06: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
Vladimír Čunát 26db832fee
qt56.qtwebkit: fix with icu-59 by upstream patch
The patch is from qtwebkit-5.9.1, but it's fairly simple and seems to
work here as well.
2017-10-15 15:16:53 +02:00
John Ericson ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
Thomas Tuegel 88d29f80c1
qttools: move qdbusviewer to runtime output 2017-08-21 06:51:31 -05:00
Frederik Rietdijk e7651e4b60 Merge pull request #27940 from bkchr/fix_qt56_ld
QT5.6: Fixes compile error with wrong LD env variable
2017-08-07 13:04:43 +02:00
Bastian Köcher 0053bf6d47 QT5.6: Fixes compile error with wrong LD env variable
QT uses -Wl linker flags and these flags only work with gcc/g++
and not with LD directly.
2017-08-07 10:51:53 +02:00
Robin Gloster 41492abf4d
qt56.qtbase: fix build 2017-08-06 21:23:38 +02:00
Thomas Tuegel e6cf9b9df0
qt56: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel 99ed5853eb
qt56.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel 8cc09c9e3e
qt56.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel dea7372ebf
qtbase: fix plugin path in CMake modules 2017-06-18 08:44:43 -05: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
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 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
Thomas Tuegel 6169bd98f5
qt58: ignore NIX_PROFILES environment variable 2017-04-28 05:49:34 -05:00
Nikolay Amiantov ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03: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
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
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 e99bc64552
Merge branch 'master' into staging
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +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
Thomas Tuegel e24261ed16
qtbase: fix sed syntax in .pc file fixup 2017-03-11 16:25:48 -06:00
Thomas Tuegel 66bc2135f6
qtbase: don't patch non-existent .pc files on Darwin 2017-03-10 09:23:05 -06:00
Bjørn Forsman f5d460a7a0
qt5.qtbase: fix host_bins= path in pkg-config file
So that pkg-config can be used to find 'moc' etc. (Currently it points
to a non-existing path.)

Fixes #22945 ('Linux kbuild incompatible with "nix-shell -p qt5.full"').
2017-03-04 15:08:47 -06: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
Nikolay Amiantov 41c1534aed qt5.qtwebengine: fix ca bundle path 2017-02-05 15:05:51 +03:00
Thomas Tuegel 2a02544b34 Merge pull request #21009 from acowley/qt5.6.2-darwin
qt5.6: darwin compatibility
2016-12-09 09:12:43 -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
Will Dietz 7c29e476a7 qt5.6/5.7: PaX compat qtwebengine
* paxmark QtWebEngineProcess so it executes on PaX kernels
* when building on host w/PaX apply patch to fix mksnapshot

Patch taken from Gentoo[1], slightly modified to use paxctl directly.

[1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
2016-12-07 20:02:41 -06: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
Thomas Tuegel 851b5944bb
qt5: factor out common setup hook for qtbase 2016-12-03 09:51:31 -06:00