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
Thomas Tuegel
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
Jun Hao
9dd335e2bb
qt59.qtbase: fix darwin build so qt full can build
2017-10-11 14:38:49 +08:00
Robin Gloster
1fbf00f0ae
Revert "qt59.qtwebengine: fix build (re: nss update)"
...
This reverts commit 8a928f3916
2017-10-09 20:50:38 +02:00
Bastian Köcher
c8bac00921
qt5: 5.9.1 -> 5.9.2
2017-10-09 19:38:38 +02:00
Michael Raskin
8a928f3916
qt59.qtwebengine: fix build (re: nss update)
2017-10-09 18:15:30 +02:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
Vladimír Čunát
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
Vladimír Čunát
41aa302727
Merge branch 'master' into staging
2017-09-26 22:31:59 +02:00
Daiderd Jordan
db2538fb0c
qt5-qtbase: fix darwin build
...
Fixes #27474
2017-09-23 21:06:09 +02:00
Thomas Tuegel
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
xd1le
99eabd6c06
qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
...
Resolves #29589 .
2017-09-22 22:26:02 +10:00
John Ericson
ed14223f8c
treewide: Manual fix more pkg-config build-inputs
2017-09-21 15:49:54 -04:00
John Ericson
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
Alexander V. Nikolaev
a830aa3af0
qt5: Cleanup temporary Qt root on nix-shell exit
2017-09-04 03:59:38 +03:00
Lukas Werling
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
Andrea Scarpino
ab1075c0d5
qt5: Add qtnetworkauth submodule
2017-08-27 18:25:36 +02:00
Jos van den Oever
b6bf1ce319
qt5.qtcharts: enable qml
...
Dependency qtdeclarative was missing so QML plugin was not built.
2017-08-23 20:05:41 +02:00
Thomas Tuegel
88d29f80c1
qttools: move qdbusviewer to runtime output
2017-08-21 06:51:31 -05:00
Alexander V. Nikolaev
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
Thomas Tuegel
ca6f1591ba
Merge pull request #27013 from expipiplus1/qt-charts
...
qt5: Add qtcharts submodule
2017-08-08 06:48:25 -05:00
Frederik Rietdijk
2203908e5f
Merge commit 'b679e14' into HEAD
2017-08-07 13:19:09 +02: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
adisbladis
ac55c6600b
qt5: 5.9.0 -> 5.9.1
2017-07-18 19:57:11 +08:00
Joe Hermaszewski
5abfed0e0b
qt5: Add qtcharts submodule
2017-07-01 15:07:49 +01:00
Thomas Tuegel
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
Bjørn Forsman
6916f24e84
treewide: enableParallelBuild -> enableParallelBuilding
2017-06-24 22:22:48 +02:00
Thomas Tuegel
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
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
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
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
c546c26e3a
qt58.qtwebkit: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
Thomas Tuegel
b1dcd271d1
qt58.qtserialport: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
Thomas Tuegel
f392614251
qt58.qtbase: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
Thomas Tuegel
7dc961b310
qttools: move runtime tools in postFixup
2017-06-18 08:44:43 -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
5a8295e596
qtbase: setup required environment in GTK3 platform theme plugin
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
fabd48272f
Merge branch 'qt--qpa-plugin-path'
2017-05-14 13:55:42 -05: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
Periklis Tsirakidis
096c008036
Fix #25723 : Remove old GNU libstdc++ for qtbase
2017-05-14 09:46:38 +02:00
Thomas Tuegel
2716e5bd80
qt58.qtbase: cleanup: sort attributes
2017-04-28 05:54:29 -05:00
Thomas Tuegel
9f00e2be18
qt58.qtbase: fix warnings in TZDIR patch
2017-04-28 05:54:28 -05:00
Thomas Tuegel
64418af8c5
qt58.qtbase: fix developer build
2017-04-28 05:54:22 -05:00
Thomas Tuegel
52ac15953e
makeQtWrapper: prefix Qt search paths
2017-04-28 05:54:21 -05:00
Thomas Tuegel
577c4f543b
qt58.qtbase: remove D-Bus library paths patch
...
Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel
5735edb894
qt58.qtbase: remove OpenSSL library paths patch
...
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel
0d0858202c
qtbase: unify Linux and Darwin patchsets
2017-04-28 05:54:17 -05:00
Thomas Tuegel
4bd911dcd6
qtbase: fill in configure flags
2017-04-28 05:54:17 -05:00
Thomas Tuegel
3062080572
qt58.qtbase: remove SSL decryption patch
...
This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
2017-04-28 05:54:16 -05:00
Thomas Tuegel
a579e0129c
qt58.qtbase: clean up configuration
2017-04-28 05:54:16 -05:00
Thomas Tuegel
e4fb41cc5b
qt58.qtbase: clean up CMake path sed scripts
2017-04-28 05:54:15 -05:00
Thomas Tuegel
9d9ab3de98
qt58.qtbase: replace mkspecs patch with sed script
2017-04-28 05:49:35 -05:00
Thomas Tuegel
1f62bf01d3
qt58.qtbase: Fix path to fallback libGL
2017-04-28 05:49:35 -05:00
Thomas Tuegel
8e2b6a90c0
qt58.qtbase: Fix path to libdbus
2017-04-28 05:49:35 -05:00
Thomas Tuegel
f45f2635e1
qt58.qtbase: Fix path to libssl and libcrypto
2017-04-28 05:49:34 -05:00
Thomas Tuegel
ff8fa7e397
qt58.qtbase: Fix path to libXcursor
2017-04-28 05:49:34 -05:00
Thomas Tuegel
40aa757898
qt58.qtbase: Fix path to libresolv
2017-04-28 05:49:34 -05:00
Thomas Tuegel
6169bd98f5
qt58: ignore NIX_PROFILES environment variable
2017-04-28 05:49:34 -05:00
Thomas Tuegel
12c981d4b7
qt58.qtbase: Fix QTCOMPOSE search patch
2017-04-28 05:49:34 -05:00
Thomas Tuegel
2ce3fe0a71
qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH
...
The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
2017-04-28 05:49:34 -05:00
Thomas Tuegel
44eb84feb6
qt58.qtbase: Update patch offsets
2017-04-28 05:49:34 -05:00
Dan Peebles
9046e54f6d
qt5: fix to work on LLVM 4
...
(this is reapplying 6b1957d17a
2017-04-25 09:37:36 -04:00
Nikolay Amiantov
ef1e28f5f6
qt56.qtwebengine: patch more library paths
...
Backport 040b86a96e
2017-04-10 11:35:00 +03:00
Periklis Tsirakidis
775531c1e3
qt58: extend darwin compatibility
2017-04-08 09:54:46 +02: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
Ambroz Bizjak
195efedd2c
qt58: Fix path to qhelpgenerator in cmake file.
...
It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
2017-04-02 11:21:34 +02:00
Thomas Tuegel
3dc1a4ba8b
Remove Qt 5.5
...
The community support window for Qt 5.5 has ended. All packages should
- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:40 -05:00
Thomas Tuegel
b4e6351c78
Remove Qt 5.7
...
The community support window for Qt 5.7 has ended. All packages should
- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:37 -05:00
Periklis Tsirakidis
b97dd5f560
qt58: enable darwin compatibility
2017-03-25 09:48:17 +01:00
Robin Gloster
dd385d9468
qt57.makeQtWrapper: fix eval
2017-03-24 18:20:01 +01:00
Nikolay Amiantov
f45cf10f6e
Merge pull request #24133 from abbradar/gtk3-qt
...
Fix GTK dependencies in wrappers
2017-03-24 01:49:41 +03: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
Nikolay Amiantov
040b86a96e
qt5.qtwebengine: use system libraries where possible
...
Fixes #23987 .
2017-03-23 00:03:33 +03:00
Nikolay Amiantov
3a948e6b07
qt5.qtwebengine: add proprietary codecs support
2017-03-23 00:03:33 +03:00
Nikolay Amiantov
a7a858aa52
qt5.qtwebengine: patch more library paths
...
Adapted from chromium derivation. Fixes qutebrowser crash.
2017-03-23 00:00:50 +03:00
Nikolay Amiantov
a40b7d07e9
makeQtWrapper, kdeWrapper: add GTK3 dependencies
2017-03-22 20:15:32 +03:00
Thomas Tuegel
7aee677a10
makeQtWrapper: wrap with runtime XDG dirs
2017-03-22 07:44:05 -05:00
Nikolay Amiantov
dec8fb077f
qt5.qtwebengine: fix library paths
...
Without this it would try to find files in qtbase
Ported to Qt 5.8.
2017-03-22 01:38:04 +03: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
742b120ddc
Merge branch 'master' into staging
...
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
michael bishop
db05f414bd
qtmultimedia-5.7: disable alsa on darwin
2017-03-16 23:15:44 -03: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
db937b9d60
qt57.full: add missing modules
...
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.
Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
2017-03-14 22:27:20 +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
Periklis Tsirakidis
a6be98c9c1
qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat
...
Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
2017-03-14 09:37:37 +01:00
Tuomas Tynkkynen
aba0b45b86
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Periklis Tsirakidis
4904df80bb
qt57.qtbase: enable darwin compatibility
2017-03-12 15:02:24 +01:00
Thomas Tuegel
e24261ed16
qtbase: fix sed syntax in .pc file fixup
2017-03-11 16:25:48 -06:00
Daiderd Jordan
a2eae3bc44
Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"
...
This reverts commit 4c0737eb80943c4ed72f
2017-03-11 00:28:23 +01:00
Thomas Tuegel
66bc2135f6
qtbase: don't patch non-existent .pc files on Darwin
2017-03-10 09:23:05 -06:00
Periklis Tsirakidis
c663f6aba9
qt57: darwin compatibility
...
Port of the qt56 compatibility patch 7a9400d
2017-03-10 08:25:09 +01:00
Vladimír Čunát
ed4a79c65e
Merge branch 'master' into staging
...
... to fix an evaluation problem in dogecoin.
2017-03-09 23:14:19 +01:00
Nikolay Amiantov
7eb9a85b90
qt5.qtwebengine: fix library paths
...
Without this it would try to find files in qtbase.
2017-03-09 15:38:10 +03:00
Thomas Tuegel
2a38551651
qtwebengine: update build system paths for Qt 5.8
2017-03-05 17:05:33 -06:00
Thomas Tuegel
869037812c
qttools: update cmake paths for Qt 5.8
2017-03-05 17:04:53 -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
cd7d8a60b4
qt58: init at 5.8.0
...
Qt 5.8 is now the default version.
2017-03-04 15:08:47 -06:00
Vladimír Čunát
b43614a6bb
Merge branch 'staging'
...
(Truly, this time :-)
2017-03-01 11:34:44 +01:00
Thomas Tuegel
0e5cce32d8
qt57: update community releases automatically
2017-02-28 11:10:02 -06:00
Gabriel Ebner
ffcc897090
qt5.qttools: fix path to qhelpgenerator
2017-02-28 16:48:44 +01:00
Thomas Tuegel
1d71027632
qt55: Add compatibility attribute for qtquickcontrols2
2017-02-27 11:50:05 -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
Nikolay Amiantov
99a83fbe1d
qt5.env: use buildEnv
...
This both simplifies the code and ensures that libraries are linked too.
2017-02-03 18:16:51 +03:00
Graham Christensen
a927abbee0
qt55.qtbase: fix patch sha with fetchpatch instead of fetchurl
2017-01-19 22:56:08 +01:00
Peter Hoeg
2dcbb8e81f
kirigami: add pre-release v2
...
It requires qt5.7
2016-12-31 19:30:02 +08:00
Thomas Tuegel
b9d3898995
qt57: 5.7.0 -> 5.7.1
2016-12-20 07:40:53 -06: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
Thomas Tuegel
a6c75a7167
Merge pull request #20856 from avnik/qt5-mktemp
...
qt5: more reproducible builds
2016-12-03 09:49:12 -06:00
Alexander V. Nikolaev
f0974e1e58
qt5: more reproducible builds
...
Avoid mktemp -d in sources, where pathnames can affect result.
2016-12-02 14:31:36 +02:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging
2016-11-26 11:27:09 +01:00
Frederik Rietdijk
2f25d962e8
qt57.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
Frederik Rietdijk
b21f1d70c6
qt56.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
Nikolay Amiantov
ca26c4e45c
qt56: 5.6.1 -> 5.6.2
2016-11-24 01:17:56 +03:00
Jos van den Oever
1fb5a9b708
qt5: Add qtwebengine and qtwebchannel to qt5.full
2016-11-22 20:48:11 +01:00
Jos van den Oever
7906624425
qtwebengine: hardcode paths
...
Hardcode the paths for which the default path resolution does not work in nix.
2016-11-20 14:36:42 +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
zraexy
c15f3a8bbe
qt57.qtwebengine: make it build
...
This is an updated version of #16561 with added qt.conf to fix QtWebEngineProcess not being able to find locales copied to 5.7
2016-10-30 16:43:13 -08:00
zraexy
cfda4310d6
qt56.qtwebengine: make it build
...
This is an updated version of #16561 with added qt.conf to fix QtWebEngineProcess not being able to find locales
2016-10-30 16:38:13 -08:00
Frederik Rietdijk
9b27c09465
qt56: use python2
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
8b7cc8a9a5
qt57: use python2
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
8fcccec543
qt55: use python2
2016-10-18 23:16:10 +02:00
Thomas Tuegel
fc23f64d34
qt5.qtbase: ruby is no longer a dependency
2016-10-04 21:49:33 -05:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen
290db94f04
Merge remote-tracking branch 'upstream/master' into staging
2016-09-09 02:40:47 +03:00
Tuomas Tynkkynen
c5e9049ac3
qt5: Fix qt5X.full
...
Use dev outputs explicitly since they aren't the first output since the
recent changes.
2016-09-06 23:42:41 +03:00
Eelco Dolstra
78178d5854
systemd: Separate lib output
...
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02: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
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
2016-08-28 07:33:42 -05:00
Moritz Ulrich
17f9b21c09
Revert "qt5: use absolute paths to plugins in CMake"
...
This reverts commit 7a9e04943d
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
Thomas Tuegel
ea90e3e6ca
qt56: init at 5.6.0
2016-05-09 10:01:03 -05:00
Thomas Tuegel
099c59ea4e
qt55.qmakeHook: fix error when package builds no libraries
2016-05-09 10:01:03 -05:00
Thomas Tuegel
3f6a2b9441
qt55.qtbase: build QGtkStyle by default
2016-04-30 12:20:09 -05:00
Thomas Tuegel
008b3d5d84
qt55.qtbase: move moveToOutput hooks
2016-04-30 12:20:09 -05:00
Thomas Tuegel
97d9368471
qmakeHook: move libtool archives and qmake project files to $dev/lib
2016-04-30 12:20:09 -05:00
Thomas Tuegel
9ea3e371df
qt5: handle dev output even without qmake
2016-04-21 04:57:01 -05:00
Nikolay Amiantov
039ff272ee
qt55: remove configureScript from qt5Submodule
2016-04-20 19:02:13 +03:00
Nikolay Amiantov
5b17e82559
qt55.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
4a4567b731
qt54.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
b857459bdb
qt5.qmakeHook: init, move from qtbase's setup hook
2016-04-20 18:55:37 +03:00
Thomas Tuegel
84a83feb4d
qt55.qtbase: do not link $out/lib into $dev/
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d5c100dc21
makeQtWrapper: defer environment settings to prePhases
2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08
qt55.qtbase: canonicalize paths in addToSearchPathOnce
2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f
qt55.qtbase: disable plugin path debugging
2016-04-20 10:01:06 -05:00
Thomas Tuegel
35f9c58206
qt55.qtquick1: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e0a87ce931
qt55.qtdeclarative: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e6c91d586c
qt55.qtbase: debug NIX_PROFILES paths
2016-04-20 10:01:06 -05:00
Vladimír Čunát
33b1dbb991
qt54.qttools: fix build
...
This one particular cmake directory seems not created by the build.
Skimming Hydra's status, this probably never worked since 35f33b438c
2016-04-08 16:10:08 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Thomas Tuegel
314792d9eb
qtquick1: unset QML_IMPORT_PATH after loading
2016-03-31 16:12:35 -05:00
Thomas Tuegel
da4b9d3b62
qtdeclarative: unset QML2_IMPORT_PATH after loading
2016-03-31 16:08:24 -05:00
Thomas Tuegel
7f336a4513
qtbase: unset QT_PLUGIN_PATH after loading
2016-03-31 14:36:30 -05:00
Nikolay Amiantov
f752424924
qt55.qtbase: use more system libraries
2016-03-31 15:53:06 +03:00
Thomas Tuegel
aa2e03e6ff
qt55.qtbase: upstream patch for backing store issue
...
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.
This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-02-18 06:09:20 -06:00
Thomas Tuegel
f43eb5ece0
qt54.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
588c8499f7
qt55: don't set output flags by default
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2efbf665a3
qt55.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0c79c7c3b2
qt54.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6e623f8784
qt54.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b3c8878a65
qt54.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7cce8b329
qt54.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d769d6c3bd
qt54.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f0ec07921
qt54.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3bb5501a88
qt54.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ece0396b55
qt54.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35f33b438c
qt54.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
1a481e58ec
qt54.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4d25e97193
qt54.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
669dcb3485
qt54.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a67c2ded6b
qt54.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b7db2185a0
qt54.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
fbcdf3ee62
qt54.qtscript: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
65ef8578c2
qt54.qtbase: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
f4e6b173bb
qt54: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d282d0bfe7
qt54.qtbase: set licenses correctly
2016-01-31 21:15:03 -06:00
Thomas Tuegel
150238dc99
qt54: updated homepage
2016-01-31 21:15:03 -06:00
Thomas Tuegel
9065ab0c8a
kde5.extra-cmake-modules: rewrite setupHook
...
The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ae75c88808
qt55.qtbase: upstream patch for backing store issue
...
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.
This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
7fae06718e
qt55.makeQtWrapper: don't set XDG_DATA_DIRS
2016-01-31 21:15:03 -06:00
Thomas Tuegel
776de6d955
qt55.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
aea5ee64db
qt55.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35c7cdac5f
qt55.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ea0794696f
qt55.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
89dc8118b4
qt55.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
abcb26c2bb
qt55.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
50de9a3f09
qt55.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
02f2761233
qt55.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ed20a6a97c
qt55.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db7cabe098
qt55.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
da454bc547
qt55.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
055b1b86c5
qt55.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
27824e3332
qt55.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6c37bebabd
qt55.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dfabcb47b
qt55.qtscript: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
8bfae5c46d
qt55.qtbase: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ac5a585ed8
qt55: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4465f438de
qt55: improve update documentation
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a6c9a6f5bf
qt55.qtbase: set licenses correctly
2016-01-31 21:15:03 -06:00
Thomas Tuegel
9adcd6f78c
qt55: update homepage
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dda0824ba
qt55.qtbase: use -system-harfbuzz
2016-01-31 21:15:03 -06:00
Thomas Tuegel
74121e07a7
qt55: use multiple outputs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db69888a02
qt55.qtbase: disable documentation
...
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3cfb552bbc
qt55.qtbase: don't depend on makeWrapper
2016-01-31 21:15:03 -06:00
Thomas Tuegel
302450dbfe
qt55.qtbase: don't propagate extra Mesa dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
e64822b87d
qt55.qtbase: don't propagate gtk dependencies
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4b844747a2
qt55.qtbase: don't propagate postgresql dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d5d7554639
qt55.qtbase: don't propagate mysql dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
5337a2a4b3
qt55.qtbase: don't propagate cups dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
fcf290cd1d
qt55.qtbase: don't refer to .dev outputs at runtime
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0055c6aa94
qt54: use multiple outputs
2016-01-31 21:14:24 -06:00
Thomas Tuegel
d8a08fff90
qt54: disable documentation
...
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
67d5a026ca
qt54.qtbase: don't propagate makeWrapper dependency
...
I have no idea how it even got here; it's certainly not necessary!
2016-01-31 21:14:24 -06:00
Thomas Tuegel
4ed8d5d125
qt54.qtbase: don't propagate extra Mesa dependency
...
The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
a6fd9e9be6
qt54.qtbase: don't propagate gtk dependencies
...
It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
b0753cec2a
qt54.qtbase: don't propagate postgresql dependency
...
It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
5fb4e3b338
qt54.qtbase: don't propagate mysql dependency
...
It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
c1f0f62a9c
qt54.qtbase: don't propagate cups dependency
...
It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
66d76f8b5b
qt54.qtbase: don't rever to .dev outputs at runtime
2016-01-31 21:14:24 -06:00
Thomas Tuegel
9e743fd151
qt54.qtbase: fix path typo in resolv patch
2016-01-28 11:15:58 -06:00
Thomas Tuegel
9695e139ec
qt55.qtbase: fix path typo in resolv patch
2016-01-28 11:15:14 -06:00
Vladimír Čunát
363f667e8b
qt5*.qtbase: fixup output references
...
Hopefully I haven't missed any references in qt5*.
2016-01-28 13:31:17 +01:00
Thomas Tuegel
21bebe1592
qt55.qtbase: fix syntax error
2016-01-23 07:52:29 -06:00
Thomas Tuegel
2b76df28b0
qt54.qtbase: fix evaluation error
2016-01-23 07:03:11 -06:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
99b1b464b4
qt55.qtbase: add patch to build with libressl 2.3
2015-12-23 22:10:01 +00:00
Thomas Tuegel
f250a6e64e
qt5: build env and full per version
2015-12-20 07:56:38 -06:00
Thomas Tuegel
1402c20bfd
qt54: backport Qt infrastructure changes from Qt 5.5
2015-12-19 16:20:27 -06:00
Thomas Tuegel
36dda92317
qt55.qtbase: don't interpolate needlessly
2015-12-19 12:26:54 -06:00
Thomas Tuegel
09e9e3e359
fixup! qt55.qtbase: don't include optional dependencies unconditionally
2015-12-19 12:26:45 -06:00
Thomas Tuegel
98e2fbe630
qt55.qtbase: remove non-existent paths from LD_LIBRARY_PATH
2015-12-19 12:18:48 -06:00
Thomas Tuegel
0a54898a20
qt55.qtbase: don't include optional dependencies unconditionally
2015-12-19 12:18:06 -06:00
Thomas Tuegel
9f62af0885
qt55.qtbase: fallback libGL path
...
If libGL is not found on the system library path, fall back to the
default Mesa driver.
2015-12-19 12:15:33 -06:00
Thomas Tuegel
081b1f1707
qt55.qtbase: set compose search path
...
This was previously set using substituteInPlace, but this leads to
duplicate search paths.
2015-12-19 12:02:57 -06:00
Thomas Tuegel
14f27e5eb7
qt55.qtbase: move sed scripts to postPatch
2015-12-19 11:59:05 -06:00
Thomas Tuegel
8b890cac07
qt55.qtbase: manage patches with quilt
2015-12-19 11:56:50 -06:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Thomas Tuegel
4cb7779a5a
qt55: 5.5.0 -> 5.5.1
2015-11-23 12:58:39 -06:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Bjørn Forsman
2cec70ce6c
qt55: fix qtmultimedia gstreamer support
...
Without this, configure will say:
Checking for openal... no
/tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
Variable GST_VERSION is not defined.
Checking for resourcepolicy... no
And there may be application runtime errors like
defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"
After this fix, configure will say:
Checking for openal... no
Checking for gstreamer... yes
Checking for gstreamer_photography... no
Checking for gstreamer_encodingprofiles... yes
Checking for gstreamer_appsrc... yes
Checking for linux_v4l... yes
Checking for resourcepolicy... no
And the above runtime error will not appear.
This fix is similar to 449b6028
2015-11-09 10:55:04 +01:00
Thomas Tuegel
24babaad9a
makeQtWrapper: wrap XDG directories
2015-10-31 08:48:53 -05:00
Thomas Tuegel
dcd70c54aa
qtbase: copy qmake to temp dir
...
Fixes #10273 .
2015-10-31 08:48:45 -05:00
Thomas Tuegel
361b1165ef
qtbase: propagate runtime dependencies
...
This is done so that makeQtWrapper works correctly.
2015-10-30 16:10:37 -05:00
Thomas Tuegel
9fa17aa293
kdoctools: set XDG_DATA_DIRS in setupHook
2015-10-30 16:10:37 -05:00
Thomas Tuegel
5a2c45427b
makeQtWrapper: always wrap impurely
2015-10-30 16:10:37 -05:00
Thomas Tuegel
fb375f1a2e
qt55: set QML import paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
b1f904f69a
qt55: set Qt Quick import paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
a3855ef9ae
qt55: set library paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
d57e50d840
separate makeQtWrapper from qtbase setup-hook
2015-10-30 16:10:37 -05:00
Thomas Tuegel
89d31daa8f
qtmultimedia: build with gstreamer-1.0
...
Fixes #10289 .
2015-10-30 16:10:37 -05:00
Thomas Tuegel
a122ca8ba3
qt55.qtbase: add makeQtWrapper
2015-10-30 16:10:37 -05:00
Thomas Tuegel
ebb9c07168
qtbase: remove redundant directory checks
...
addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.
2015-10-30 16:10:37 -05:00
Thomas Tuegel
b44923561b
qtbase: include current package in runtime paths
...
The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and
XDG_DATA_DIRS did not include the appropriate paths from the current
package being built because addToSearchPath does not add directories
which don't exist.
2015-10-30 16:10:37 -05:00
Vladimír Čunát
261961c97d
postgresql: split and fixup some referrers
2015-10-28 10:09:32 +01:00
Vladimír Čunát
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
Vladimír Čunát
debdd33fc8
qt5: lib location fixes, mainly due to multiple outputs
2015-10-13 20:18:59 +02:00
Thomas Tuegel
a5a031c8ff
wrapQtProgram: --set does not take separator
...
The --set flag to wrapProgram does not take a separator character, just
a value.
2015-10-05 13:08:26 -05:00
Bjørn Forsman
3dec100104
qt55: apply mkspecs-libgl.patch from qt54
2015-09-28 10:39:11 +02:00
Bjørn Forsman
583845d00b
qt54: add missing mesa include dir
...
Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to
find <GL/gl.h>. This fixes it.
[1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html
(Although since nixpkgs qtcreator still lacks 'examples', we have to
download the sources manually and use "qmake && make".)
2015-09-28 10:39:11 +02:00
Thomas Tuegel
fe49213ba6
qt55: init at 5.5.0
2015-09-27 09:46:48 -05:00
Arseniy Seroka
d9b4d81a39
Merge pull request #10003 from gebner/qutebrowser-youtube
...
qutebrowser: youtube support
2015-09-23 18:26:04 +03:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Gabriel Ebner
449b6028a6
qt5.multimedia: fix gstreamer support.
2015-09-22 18:45:45 +02:00
Thomas Tuegel
e5b124e492
qt5Full: only include derivations
2015-09-19 11:37:39 -05:00
Thomas Tuegel
824f7a0962
Remove Qt 5.3
2015-09-19 10:03:09 -05:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Thomas Tuegel
e9a8c5a988
Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl
...
qt5: embed path to mesa (libGL) in Qt mkspecs file
2015-08-29 18:11:15 -05:00
Thomas Tuegel
b873f5bd62
Add qtEnv
2015-08-29 17:47:49 -05:00
Bjørn Forsman
06ed82677a
qt5: embed path to mesa (libGL) in Qt mkspecs file
...
Fixes this problem, when building apps in QtCreator:
...(compile output window)
g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
-o qt-test3 main.o mainwindow.o moc_mainwindow.o \
-L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
-lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
/nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
collect2: error: ld returned 1 exit status
mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.
Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
2015-08-29 22:21:57 +02:00
Thomas Tuegel
b5b78eaf44
qt54: create share/ in setupHook
2015-08-23 14:29:09 -05:00
Thomas Tuegel
4098e79378
qt54: set documentation path in setupHook
2015-08-23 13:47:24 -05:00
Thomas Tuegel
e40579d91e
qt54: set runtime env vars during build for makeWrapper
...
Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
2015-08-23 10:16:21 -05:00
Bjørn Forsman
019a23db3e
qt5: specify docdir
...
Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
2015-08-23 09:56:09 +02:00
Bjørn Forsman
c2a8e5e609
qt53: sync plugin/import/qml dirs with qt54
...
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Thomas Tuegel
28f0eb5af8
qt54: gdb required only for developerBuild
2015-08-08 15:23:48 -05:00
Thomas Tuegel
bdb24b90c8
qt53: gdb required only for developerBuild
2015-08-08 15:23:05 -05:00
Thomas Tuegel
6a10139bba
qt53: disable unsupported SIMD instruction sets
2015-07-20 15:04:44 -05:00
Thomas Tuegel
4d36b10f90
qt53: override postgresql autodetection
2015-07-20 15:03:52 -05:00
Thomas Tuegel
965f330c65
qt5.base: disable unsupported SIMD instruction sets
...
If not explicitly disabled, Qt tries to detect support for the various
instruction sets. As a result, binaries built on Hydra may use
instruction sets unsupported by clients.
2015-07-20 08:46:20 -05:00
Thomas Tuegel
17a65c4bf0
qt5.base: override postgresql autodetection
2015-07-20 08:41:57 -05:00
Thomas Tuegel
3f3da5ccbd
qt5.base: install setupHook correctly
2015-07-19 13:38:51 -05:00
Thomas Tuegel
bb6459dd0b
qt5.base: use pkgconfig unconditionally
2015-07-19 13:38:36 -05:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
Pascal Wittmann
8a3a3c7c4b
qt54: fix setup-hook.sh, lib/ was not populated in some cases
2015-07-01 20:38:03 +02:00
Thomas Tuegel
036f11f323
qt5: set location to qmake in setup-hook
2015-07-01 12:14:43 -05:00
Thomas Tuegel
9333155666
qt5: set paths correctly
2015-07-01 12:14:33 -05:00
Thomas Tuegel
09a53440f1
qt54: don't propagate build inputs
...
This disables propagated of Qt 5 build inputs at the request of
@edolstra. If this breaks your build, you need to add the missing
dependencies yourself. If this breaks your package at runtime, you need
to wrap your package to set either the plugin path or the QML import
path.
2015-06-25 09:03:41 -05:00
Thomas Tuegel
fa9ed76122
qt54: regenerate manifest
2015-06-25 09:03:41 -05:00
Fabian Schmitthenner
4e9327e7ac
add qt decrypt ssl traffic option
...
this introduces an argument to qt5 that if enabled allows
e.g. wireshark to show decrypted ssl traffic from a qt
application
2015-06-12 13:09:27 +02:00
Thomas Tuegel
e0db2213fc
Update qt-5.4.1 -> qt-5.4.2
2015-06-07 22:18:35 -05:00
William A. Kennington III
b07929b0a3
Use libpulseaudio instead of pulseaudio
2015-05-29 14:32:56 -07:00
Thomas Tuegel
b84f3e85d9
Fix QGtkStyle for Qt 5 versions
2015-05-19 11:37:21 -05:00
Thomas Tuegel
7094ae27da
qt53: fix qtwebkit build with new glib
2015-05-13 12:49:14 -05:00
Ellis whitehead
bafde0fb6f
patch Qt 5.4.1 to use XDG_CONFIG_DIRS in QSettings
2015-04-23 17:52:22 +02:00
Thomas Tuegel
88918e10e9
Merge branch 'master' into staging
2015-04-10 07:45:38 -05:00
Thomas Tuegel
74b2253ef8
qt54: remove obsolete qmake expression
2015-04-07 16:30:57 -05:00
Ambroz Bizjak
35fb8d9eb9
Qt 5.4.1: Make it build.
...
Looks like the original version update was incomplete. This sets the right
version attribute and fixes two patches which no longer apply.
2015-04-07 11:26:48 -05:00
