Commit graph

151 commits

Author SHA1 Message Date
Sandro 36b457fa36
Merge pull request #223271 from wineee/qt6fix 2023-05-26 16:11:16 +02:00
K900 028fbeb19c qt6.qtmqtt: 6.5.0 -> 6.5.1, switch to fetchFromGitHub 2023-05-25 18:21:29 +03:00
K900 8e0510ff6a qt6: 6.5.0 -> 6.5.1 2023-05-25 18:12:08 +03:00
rewine df8475e786
qtbase-setup-hook: don't use envBuildHostHooks 2023-05-24 09:52:24 +08:00
rewine a0402498c2
qt6.qtdoc: fix build 2023-05-24 09:52:24 +08:00
rewine 9bc545612e
qt6.qtbase: allow find qt tools in QTTOOLSPATH 2023-05-24 09:52:24 +08:00
rewine 12d74ff027
qt6.qttools: build qdoc 2023-05-24 09:52:23 +08:00
rewine ad617cad83
qt6.qt5compat: clear up build inputs 2023-05-24 09:45:21 +08:00
Weijia Wang 112480ffc5 qt6.qtmultimedia: fix build on aarch64-darwin 2023-04-25 17:44:16 +03:00
github-actions[bot] e2ba84f234
Merge master into staging-next 2023-04-20 12:01:27 +00:00
Euan Kemp df8e7b62b2 qt6.qtwebengine: patch to fix xkb layout crash
See https://github.com/NixOS/nixpkgs/issues/226484
2023-04-20 18:36:28 +09:00
github-actions[bot] f5d4a4e3d6
Merge master into staging-next 2023-04-19 06:01:15 +00:00
Nick Cao 6874adc57c
Merge pull request #226606 from Cynerd/qtmqtt
qt6Packages.qtmqtt: init mdule at 6.5.0
2023-04-19 11:53:35 +08:00
github-actions[bot] 93e4495c3e
Merge master into staging-next 2023-04-19 00:01:56 +00:00
Karel Kočí 190163b955
qt6Packages.qtmqtt: init mdule at 6.5.0
This module is not in mirrors for some reason.
2023-04-18 19:01:54 +02:00
Weijia Wang 8c1e819599 qt6.qtwebengine: add aarch64-darwin support 2023-04-18 18:48:33 +03:00
github-actions[bot] 26bd8755a4
Merge master into staging-next 2023-04-18 06:01:10 +00:00
Ryan Lahfa 1a689954ab
Merge pull request #225881 from matklad/makeBinaryWrapper
write-qt-apps-hook.sh: use make-binary-wrapper for significant speedups
2023-04-16 17:52:28 +02:00
Nick Cao fca522b538
qt6.qtbase: set strictDeps, remove python3 from buildInputs to reduce closure size
python3 is references in the shebang of three scripts:

/nix/store/gbi67akslfd2n5d8q4vxpy8qzih31myl-qtbase-6.5.0
└───libexec/qt-testrunner.py: …#!/nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/bin/python3.# C…
    libexec/sanitizer-testrunner.py: …#!/nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/bin/python3.# C…
    mkspecs/features/uikit/devices.py: …#!/nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10/bin/python3.# C…
    → /nix/store/fdqpyj613dr0v1l1lrzqhzay7sk4xg87-python3-3.10.10

All of them are normally not used in the build process of packages thus
the shebangs batching can be safely skipped.
2023-04-16 22:17:29 +08:00
Nick Cao 6d7ec3e498
qt6.full: add missing modules 2023-04-16 22:17:28 +08:00
Nick Cao 4171299ee9
qt6.qtgrpc: init at 6.5.0 2023-04-16 22:17:27 +08:00
Nick Cao 5e316e49dd
qt6.qtquickeffectmaker: init at 6.5.0 2023-04-16 22:17:27 +08:00
Nick Cao 4769460fb3
qt6.qtlocation: init at 6.5.0 2023-04-16 22:17:26 +08:00
Nick Cao 52703c427e
qt6: move mkspecs/modules to dev output 2023-04-16 22:17:25 +08:00
Nick Cao bb6f287d93
qt6.qtbase: refresh patches 2023-04-16 22:17:25 +08:00
Nick Cao 09bd819958
qt6: 6.4.3 -> 6.5.0 2023-04-16 22:17:24 +08:00
Weijia Wang 7f8c35748e qt6.qtwebengine: add frameworks for darwin 2023-04-16 04:07:30 +03:00
Weijia Wang 4566cd6901 qt6.qtbase: add frameworks on x86_64-darwin 2023-04-15 14:39:04 +03:00
Weijia Wang 4f399bd5c4
Merge pull request #226182 from wegank/qt6-qtwebengine-refactor
qt6.qtwebengine: separate linux-only parts
2023-04-14 22:12:37 +03:00
Weijia Wang 75f03610ba qt6.qtwebengine: separate linux-only parts 2023-04-14 21:34:17 +03:00
Weijia Wang bd8c68fdec qt6: avoid building under /tmp on darwin 2023-04-14 21:11:09 +03:00
Nick Cao a1a3813f7b
qt6: drop devTools attribute as they are no longer moved to the dev output 2023-04-14 19:30:02 +08:00
Nick Cao 0bad2288a7
qt6.qttools: symlink bin to dev output
There are several reference to "${qttools.dev}/bin" treewide, adding the
symlink to fix compatibility with these packages.
2023-04-14 19:30:01 +08:00
Nick Cao e5ba8e7113
qt6.qttools: fix embedded path to tools 2023-04-14 19:30:01 +08:00
Nick Cao 37e3fafb41
qt6.qtdeclarative: drop outdated workarounds 2023-04-14 19:30:00 +08:00
Nick Cao 91fb53dce3
qt6.qtwebengine: remove outdated postFixup phase 2023-04-14 19:29:59 +08:00
Nick Cao d25348517e
qt6.qtbase: fixup paths in setup hooks 2023-04-14 19:29:58 +08:00
Nick Cao bf05505377
qt6.qtbase: remove fixQmakeLibtool hook
As we are now building qt modules with cmake, libtool libraries are no
longer generated, the fixQmakeLibtool hook can be droppped.
2023-04-14 19:29:57 +08:00
Nick Cao f9f2b3ae42
qt6: fix references to qmake
As devTools are no longer moved to the dev output,
paths to qmake has to be updated.
2023-04-14 19:09:57 +08:00
Nick Cao d84e2bf056
qt6: do not move devTools to dev output 2023-04-14 19:09:56 +08:00
Nick Cao 5aa78f89f0
qt6.qtbase: refresh patches
Apart from the previous ones, two new patches are added. One for
reducing the runtime closure size by removing reference to cmake, the
other for fixing the linker flags in generated qmake files.
2023-04-14 19:09:55 +08:00
Nick Cao d94ae302c6
qt6.qtbase: do not embed compiler information into generated cmake files
The qt build system embeds information about compilers used during
building qtbase into the generated cmake files, to avoid mixing
different compilers when building qt modules, however this greatly
bloats the closure size of qtbase and the mixed use of compilers is
sometimes desired in Nixpkgs.
2023-04-14 18:38:03 +08:00
Nick Cao 97a538791c
qt6: set "moveToDev" to false
The qt build system locates header files, libraries and other installed
components with paths relative to the cmake files. Thus the default
behavior of moving them to the "dev" output breaks these expectations
and is now disabled.
2023-04-14 18:34:21 +08:00
Nick Cao 21a773c671
qt6: drop cmake patch used for fixing cmake file generation
The "multiple-outputs.sh" setup hook moves "include", "lib/cmake" and
other folders into the "dev" output if it exists, thus breaking the
invariants expected by the qt build system and we used to patch cmake to
fixup the generated cmake files. In a series of changes to rework qt
packaging, we are now setting "moveToDev" to false to suppress that
behavior, and the cmake patch is no longer required.
2023-04-14 18:34:07 +08:00
Weijia Wang 1bf4cbfa5e qt6.qtconnectivity: fix build on darwin 2023-04-13 22:59:13 +03:00
Aleksey Kladov e8ce8afd55 write-qt-apps-hook.sh: use make-binary-wrapper for significant speedups
QT apps tend to call makeWrapper with a lot of arguments, which causes
noticable slowdowns (+100ms for app startup). The slow down boils down
to two reasons:

- the required string processing is O(N^2)
- bash is slow at doing the processing

By using the binary wrapper, we fix the second point, brining the
overhead down from 100ms to just 4ms or thereabouts.

I tested this change by rebuilding my whole system with it (I use
plasma). It booted and it works (that's where I type this commit
message), but I am not 100% sure if this won't break anything else.

Closes: #225871
2023-04-12 12:02:19 +01:00
Nick Cao 1cf3cca8c0
qt6: move all qmake related files to dev output 2023-04-11 15:40:56 +08:00
Nick Cao bf30644a3d
qt6.qtModule: drop fixup handlings
As they are either already part of the qtbase setupHook,
or no longer required as we are building qt components with cmake.
2023-04-11 15:40:56 +08:00
Nick Cao 528dd7fa25
Merge pull request #225555 from NickCao/qt6-cleanup
qt6: general cleanup to ease future reworking of packaging
2023-04-11 07:39:53 +08:00
Nick Cao c14e333ec0
qt6.qtModule: removed unnecessary callPackage arguments 2023-04-10 18:00:35 +08:00