a98a767695
qt5: install pkg_config files on darwin
...
Fixes #31685
This patch is applied in Homebrew here and looks to have worked for
them:
fafbdbd237/Formula/qt.rb (L33-L44)
2018-02-22 11:21:59 -06:00
32ce7012f0
Merge branch 'master' into gcc-7
2018-02-18 16:27:22 -05:00
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
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
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
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
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
5abf6ef5a8
qt5: 5.10.0 -> 5.10.1
2018-02-15 08:54:29 +01:00
0bf153f9c0
qt59-qtbase: fix darwin build with clang-5
2018-02-12 22:50:36 +01:00
a93b1ea803
qt510-qtbase: fix darwin build with clang-5
2018-02-12 22:15:04 +01:00
0905e5e23a
qt59-qtbase: fix darwin build
2018-02-10 20:30:38 +01:00
4a39533ab3
qt5: debug flag should never be null
2018-01-20 09:10:57 -06:00
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
62633d0605
qt510-qtbase: fix darwin build
...
Includes most of the changes from 3793320958
2018-01-17 22:07:35 +01:00
5783980fc6
qtbase: fix evaluation error
...
`git rebase` strikes again!
2018-01-15 19:12:01 -06:00
04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0
2018-01-15 18:49:27 -06:00
617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0
2018-01-15 18:49:13 -06:00
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
3793320958
qt5-qtbase: update darwin patch
2018-01-09 22:47:34 +01:00
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
e5b1a5724e
Qt5: 5.9.3 -> 5.10.0
2018-01-02 14:01:37 +01:00
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
...
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
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
f29000b002
Merge branch 'master' into staging
...
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
9359050ae2
mariadb: more lib -> connector-c
2017-12-29 02:18:35 +01:00
907face464
qt5: Add qtvirtualkeyboard submodule
2017-12-28 21:13:45 +08:00
fb349c84e2
qt5.qttools: install macdeployqt on darwin
2017-12-20 08:56:54 +00:00
145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3""
...
This reverts commit a1b77bfe5f
2017-12-11 11:32:16 -06:00
f568450637
qmake: enable parallel building of qmake projects by default
2017-12-07 08:52:42 +00:00
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
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
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
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build
2017-11-12 09:51:48 -06:00
ded18e4f47
qt59.qtbase: restore Darwin collection-types patch
2017-11-12 09:51:48 -06:00
2063d54c72
qt56: 5.6.2 -> 5.6.3
2017-11-12 09:51:48 -06:00
04ba30ef8e
qt59.qtbase: replace `type` with `command` for POSIX compatibility
2017-11-12 09:51:48 -06:00
3729b77531
qt5.mkDerivation: default enableParallelBuilding = true
2017-11-12 09:51:48 -06:00
4f72831934
qt56.qtbase: replace `type` with `command` for POSIX compatibility
2017-11-12 09:51:47 -06:00
9e05d61dd7
qt56: remove unused obsolete expressions
2017-11-12 09:51:47 -06:00
91b362c5cf
qt56.qtwebkit: fix build with ICU 59
2017-11-12 09:51:47 -06:00
c1c21cde1d
Revert "qt5: Add qtnetworkauth submodule"
2017-11-11 17:53:01 +01:00
1e9edbf6ee
Merge pull request #28480 from ilpianista/qt5
...
qt5: Add qtnetworkauth submodule
2017-11-11 08:25:10 -06:00
ae6ac0ed3e
qt5: Add instructions for updating and patching
2017-11-07 07:18:50 -06:00
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
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
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
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
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
c800d574bf
qt5: fix Darwin build for 5.9.2
2017-10-17 13:18:33 +08:00
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
4cf0b6ba5d
Merge pull request #30255 from bkchr/qt_5_9_2
...
qt5: 5.9.1 -> 5.9.2
2017-10-12 09:08:59 -05:00
9dd335e2bb
qt59.qtbase: fix darwin build so qt full can build
2017-10-11 14:38:49 +08:00
1fbf00f0ae
Revert "qt59.qtwebengine: fix build (re: nss update)"
...
This reverts commit 8a928f3916
2017-10-09 20:50:38 +02:00
c8bac00921
qt5: 5.9.1 -> 5.9.2
2017-10-09 19:38:38 +02:00
8a928f3916
qt59.qtwebengine: fix build (re: nss update)
2017-10-09 18:15:30 +02:00
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
e83b78b3ed
Merge older staging
...
This is almost fully rebuilt on staging (waiting for ~7.5k Darwin jobs),
but now master got ~17k rebuild, so staging wouldn't catch up this way.
2017-09-27 20:51:14 +02:00
41aa302727
Merge branch 'master' into staging
2017-09-26 22:31:59 +02:00
db2538fb0c
qt5-qtbase: fix darwin build
...
Fixes #27474
2017-09-23 21:06:09 +02:00
5eb2c7a753
Merge pull request #28237 from avnik/qt5-mktemp
...
qt5: use `mktemp -d` to create fake Qt prefix in nix-shell
2017-09-23 07:18:25 -05:00
99eabd6c06
qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
...
Resolves #29589 .
2017-09-22 22:26:02 +10:00
ed14223f8c
treewide: Manual fix more pkg-config build-inputs
2017-09-21 15:49:54 -04:00
531e4b80c9
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
...
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
a830aa3af0
qt5: Cleanup temporary Qt root on nix-shell exit
2017-09-04 03:59:38 +03:00
f0a1ab78b4
meson/ninja: add setup hooks ( #28444 )
...
* Add setupHook for meson/ninja build
* libhttpseverywhere: Use meson/ninja setupHooks
* jamomacore: Remove superfluous ninja buildInput
* Remove obsolete ninja buildPhases
These are all handled by ninja's setup hook.
* lean2, xcbuild: fix build with ninja setup hook
Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.
* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
ab1075c0d5
qt5: Add qtnetworkauth submodule
2017-08-27 18:25:36 +02:00
b6bf1ce319
qt5.qtcharts: enable qml
...
Dependency qtdeclarative was missing so QML plugin was not built.
2017-08-23 20:05:41 +02:00
88d29f80c1
qttools: move qdbusviewer to runtime output
2017-08-21 06:51:31 -05:00
eabe2efa10
qt5: Fallback to mktemp -d for temporary QT root.
...
Fallback to `mktemp -d` for temporary QT root, if invoked in shell mode.
Should fix problem from #27174 .
2017-08-13 17:26:27 +03:00
ca6f1591ba
Merge pull request #27013 from expipiplus1/qt-charts
...
qt5: Add qtcharts submodule
2017-08-08 06:48:25 -05:00
2203908e5f
Merge commit 'b679e14' into HEAD
2017-08-07 13:19:09 +02:00
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
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
41492abf4d
qt56.qtbase: fix build
2017-08-06 21:23:38 +02:00
ac55c6600b
qt5: 5.9.0 -> 5.9.1
2017-07-18 19:57:11 +08:00
5abfed0e0b
qt5: Add qtcharts submodule
2017-07-01 15:07:49 +01:00
2ed4b6fad8
qt59: fix qtCompatVersion
...
Qt 5.9 was incorrectly identified as being plugin-compatible with Qt 5.8.
2017-06-28 08:38:38 -05:00
6916f24e84
treewide: enableParallelBuild -> enableParallelBuilding
2017-06-24 22:22:48 +02:00
22b10bac78
qt5: 5.8.0 -> 5.9.0
...
Qt 5.8 is immediately removed because its support window is ended.
The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.
kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
2017-06-24 07:43:57 -05:00
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
dab7700f6c
qt58: 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
99ed5853eb
qt56.qtserialport: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:47 -05:00
8cc09c9e3e
qt56.qtwebkit: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:47 -05:00
c546c26e3a
qt58.qtwebkit: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
b1dcd271d1
qt58.qtserialport: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
f392614251
qt58.qtbase: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
7dc961b310
qttools: move runtime tools in postFixup
2017-06-18 08:44:43 -05:00
dea7372ebf
qtbase: fix plugin path in CMake modules
2017-06-18 08:44:43 -05:00
d9f29afa64
qt5: use one output by default
2017-06-18 08:44:43 -05:00
6fa41788be
qt5: separate plugins from libraries
2017-06-18 08:44:42 -05:00
5a8295e596
qtbase: setup required environment in GTK3 platform theme plugin
2017-06-18 08:44:42 -05:00
c816bbc8a8
qt5: remove makeQtWrapper
2017-06-18 08:44:42 -05:00
1607f51613
qmake: unify Darwin and Linux setup hooks
2017-06-18 08:43:39 -05:00
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation
2017-06-18 08:42:19 -05:00
210f688802
qt5: rename qmakeHook to qmake
2017-06-18 08:41:57 -05:00
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
515414ed32
Merge branch 'master' into staging
2017-05-16 18:32:43 +02:00
f5c568446a
qtwebkit-*: fix #25585 : bad RPATH entries
2017-05-16 18:30:58 +02:00
fabd48272f
Merge branch 'qt--qpa-plugin-path'
2017-05-14 13:55:42 -05:00
7c338b7df8
qtbase: search platform plugin paths before other plugin paths
2017-05-14 13:55:03 -05:00
Matthew Bauer
Shea Levy
Bjørn Forsman
Nikolay Amiantov
Vladimír Čunát
Bastian Köcher
Daiderd Jordan
Thomas Tuegel
Will Dietz
John Ericson
John Ericson
Robin Gloster
adisbladis
Orivej Desh
Peter Simons
Thomas Tuegel
Tuomas Tynkkynen
Jun Hao
Michael Raskin
xd1le
Alexander V. Nikolaev
Lukas Werling
Andrea Scarpino
Jos van den Oever
Frederik Rietdijk
Frederik Rietdijk
Joe Hermaszewski