adisbladis
0e086dd1c1
Merge pull request #34993 from bkchr/qt_5_10_1
...
qt5: 5.10.0 -> 5.10.1
2018-02-26 03:43:02 +08:00
Shea Levy
32ce7012f0
Merge branch 'master' into gcc-7
2018-02-18 16:27:22 -05: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
2018-02-18 14:44:16 +01:00
Nikolay Amiantov
44901407f0
qtEnv: fix paths in qt.conf
...
The shell variables from setup hook are not visible here, so instead substitute
them from Nix side.
2018-02-18 14:44:16 +01:00
Bjørn Forsman
7ab180999b
qt510.full: add missing modules
...
Specifically: qtquickcontrols2, qtvirtualkeyboard, qtwebchannel,
qtwebengine, qtwebkit.
This fixes a regression since qt56.full.
2018-02-18 12:58:26 +01:00
Bjørn Forsman
23cdc3224a
qt59.full: add missing modules
...
Specifically: qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.
This fixes a regression since qt56.full.
2018-02-18 12:58:26 +01:00
Vladimír Čunát
d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra
...
Before > 64 MiB, now ~25 MiB.
2018-02-17 09:45:38 +01:00
Bastian Köcher
5abf6ef5a8
qt5: 5.10.0 -> 5.10.1
2018-02-15 08:54:29 +01:00
Daiderd Jordan
0bf153f9c0
qt59-qtbase: fix darwin build with clang-5
2018-02-12 22:50:36 +01:00
Daiderd Jordan
a93b1ea803
qt510-qtbase: fix darwin build with clang-5
2018-02-12 22:15:04 +01:00
Daiderd Jordan
0905e5e23a
qt59-qtbase: fix darwin build
2018-02-10 20:30:38 +01:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null
2018-01-20 09:10:57 -06:00
Thomas Tuegel
c1720b412b
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE
...
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.
See also: #34039 #34038 #33935 #33933 #33930 #33927
2018-01-20 09:10:57 -06:00
Daiderd Jordan
62633d0605
qt510-qtbase: fix darwin build
...
Includes most of the changes from 3793320958
2018-01-17 22:07:35 +01:00
Thomas Tuegel
5783980fc6
qtbase: fix evaluation error
...
`git rebase` strikes again!
2018-01-15 19:12:01 -06:00
Thomas Tuegel
04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0
2018-01-15 18:49:27 -06:00
Thomas Tuegel
617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0
2018-01-15 18:49:13 -06:00
Thomas Tuegel
75d2a7dc4d
qt5: reduce closure size
...
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.
Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
2018-01-15 18:48:37 -06:00
Daiderd Jordan
3793320958
qt5-qtbase: update darwin patch
2018-01-09 22:47:34 +01:00
Will Dietz
42b84057a4
qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait
...
Based on:
4e8083b4ab#33396 ,
which links to related issues in other distributions and upstream Qt.
2018-01-04 13:08:51 -06:00
Bastian Köcher
e5b1a5724e
Qt5: 5.9.3 -> 5.10.0
2018-01-02 14:01:37 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
...
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d
treewide: Don't use envHook anymore
...
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging
...
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Robin Gloster
9359050ae2
mariadb: more lib -> connector-c
2017-12-29 02:18:35 +01:00
adisbladis
907face464
qt5: Add qtvirtualkeyboard submodule
2017-12-28 21:13:45 +08:00
Orivej Desh
fb349c84e2
qt5.qttools: install macdeployqt on darwin
2017-12-20 08:56:54 +00:00
Thomas Tuegel
145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3""
...
This reverts commit a1b77bfe5f
2017-12-11 11:32:16 -06:00
Orivej Desh
f568450637
qmake: enable parallel building of qmake projects by default
2017-12-07 08:52:42 +00:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
...
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
John Ericson
da19c34d0f
stdenv setup: Always use both propagated files
...
This continues #23374 , which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.
This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05: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
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build
2017-11-12 09:51:48 -06:00
Thomas Tuegel
ded18e4f47
qt59.qtbase: restore Darwin collection-types patch
2017-11-12 09:51:48 -06:00
Thomas Tuegel
2063d54c72
qt56: 5.6.2 -> 5.6.3
2017-11-12 09:51:48 -06:00
Thomas Tuegel
04ba30ef8e
qt59.qtbase: replace type with command for POSIX compatibility
2017-11-12 09:51:48 -06:00
Thomas Tuegel
3729b77531
qt5.mkDerivation: default enableParallelBuilding = true
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
Peter Simons
c1c21cde1d
Revert "qt5: Add qtnetworkauth submodule"
2017-11-11 17:53:01 +01:00
Thomas Tuegel
1e9edbf6ee
Merge pull request #28480 from ilpianista/qt5
...
qt5: Add qtnetworkauth submodule
2017-11-11 08:25:10 -06:00
Thomas Tuegel
ae6ac0ed3e
qt5: Add instructions for updating and patching
2017-11-07 07:18:50 -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
Thomas Tuegel
4866f16fba
Revert "Merge pull request #30255 from bkchr/qt_5_9_2"
...
This reverts commit 4cf0b6ba5d756b9c7d6chttps://bugreports.qt.io/browse/QTBUG-64017
2017-11-02 14:28:39 -05:00
Tuomas Tynkkynen
fd29f6685f
qt5, plasma-5: Make 'bin' output the first one
...
Stay consistent with other multiple output packages.
2017-10-24 23:48:49 +03:00
Daiderd Jordan
215f2cac80
Merge pull request #30404 from j-hao/master
...
qt5: fix Darwin build for 5.9.2
2017-10-19 23:41:44 +02:00
Bastian Köcher
7132cbd598
qt5: Disable gold linker on Linux as it generates duplicate symbols
...
Signed-off-by: adisbladis <adis@blad.is>
2017-10-19 11:09:25 +08:00
Jun Hao
c800d574bf
qt5: fix Darwin build for 5.9.2
2017-10-17 13:18:33 +08: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
