Commit Graph

56 Commits

Author SHA1 Message Date
Majiir Paktu
2f5f1647c3 pythonPackages: add qt6 override
A few qt6 modules require python. We need to override with the
appropriate python version in order to use qt6 with non-default python
packages (like python311).
2023-09-03 13:39:22 -04:00
Theodore Ni
d494084017
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
2023-08-20 20:09:45 -07:00
Artturi
bde196dde9
Merge pull request #245957 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing2 2023-08-20 18:57:05 +03:00
Jan Tojnar
86797b2008 Merge branch 'staging-next' into staging
Conflicts:
- pkgs/development/libraries/qt-6/default.nix
  Merge a5b92645f1 and 0597d865ef
2023-08-16 19:37:11 +02:00
K900
0597d865ef qt6: include qttranslations properly 2023-08-15 22:11:10 +03:00
Adam Joseph
cbc8aa437c treewide: use uncurried version of makeScopeWithSplicing 2023-08-14 02:51:10 +03:00
Juan Pedro Bolívar Puente
a5b92645f1 qt6.qtbase: fix macdeployqt would not find qmlimportscanner
The qmlimportscanner tool is provided by qtdeclarative. Because of the
modularized installation in Nix, it can not be found via the usual
mechanisms.  Also, hard-coding it like we do for Qt5 would also not
work, as it would require making qtbase depend on qtdeclarative.

Here we add an option to provide its location via the environment.
While this means macdeployqt does not work out of the box, it provides
a workaround for users.

Also, we make sure that qmlimportscanner gets passed the right QML
import paths as described in the environment.
2023-08-10 14:56:23 +02:00
Weijia Wang
1447a5804b qt6.qtwebengine: unbreak on x86_64-darwin 2023-06-22 07:23:21 +03:00
rewine
9bc545612e
qt6.qtbase: allow find qt tools in QTTOOLSPATH 2023-05-24 09:52:24 +08: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
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
Weijia Wang
7f8c35748e qt6.qtwebengine: add frameworks for darwin 2023-04-16 04:07:30 +03:00
Weijia Wang
bd8c68fdec qt6: avoid building under /tmp on darwin 2023-04-14 21:11:09 +03: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
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
c14e333ec0
qt6.qtModule: removed unnecessary callPackage arguments 2023-04-10 18:00:35 +08:00
Nick Cao
5d13961fd6
qt6: format pkgs/development/libraries/qt-6/default.nix 2023-04-10 17:58:02 +08:00
Nick Cao
8a159fe975
qt6.qtbase: removed unnecessary callPackage arguments 2023-04-10 17:56:35 +08:00
Nick Cao
12cfa69c8e
qt6: move stdenv and cmake override to within pkgs/development/libraries/qt-6 2023-04-10 17:53:56 +08:00
Nick Cao
845e491205
qt6.qtModules: use callPackage 2023-04-10 17:50:44 +08:00
Nick Cao
9604890e72
qt6: use callPackage in all-packages.nix 2023-04-10 17:42:36 +08:00
Nick Cao
25c1820914
qt6.qtbase: add patch to fix handling of variable fonts 2023-03-22 16:26:29 +08:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Sergei Trofimovich
b9b1d958d0 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/qt-6/modules/qtbase.nix
	pkgs/stdenv/linux/make-bootstrap-tools.nix
2023-01-20 21:56:57 +00:00
Alyssa Ross
0ae87d514f treewide: add names to all setup hooks 2023-01-19 15:00:36 +00:00
Weijia Wang
100cf5700d qt6.qtbase: enable sandbox builds 2023-01-15 03:23:11 +01:00
Weijia Wang
c0d8c84f40 qt6.qtbase: add aarch64-darwin support 2022-11-29 00:41:33 +01:00
Weijia Wang
df46edff3e qt6.qtwebview: add aarch64-darwin support 2022-11-28 23:51:41 +01:00
Weijia Wang
65a2669c01 qt6.qtspeech: unbreak on aarch64-darwin 2022-11-28 23:51:41 +01:00
Weijia Wang
8091739d36 qt6.qtmultimedia: unbreak on aarch64-darwin 2022-11-28 23:51:41 +01:00
Weijia Wang
1b23119f21 qt6.qtconnectivity: fix build on aarch64-darwin 2022-11-28 23:51:40 +01:00
Jörg Thalheim
42c5aedcde
Merge pull request #181730 from Mic92/qt6
qt6.full: add
2022-11-20 20:12:14 +01:00
Artturin
341e6fd558 splice.nix: start deprecating nativeDrv and crossDrv 2022-11-19 00:04:54 +02:00
Nick Cao
e177a194c0
qt6.qtmultimedia: add and propagate the required/recommended gst plugins
reference: https://doc.qt.io/qt-6/videooverview.html#linux
2022-11-05 21:39:11 +08:00
Nick Cao
423d2dada0
qt6.qtbase: add patch for correctly loading tzdata 2022-11-05 21:39:05 +08:00
Luna Nova
b5f31454a3
qt-6: Port hooks from qt-5 2022-10-05 22:09:13 -07:00
Nick Cao
f1b15aebd2
qt6.qtquick3dphysics: init at 6.4.0 2022-09-29 21:31:45 +08:00
Nick Cao
2b96f0ca6d
qt6.qtspeech: init at 6.4.0 2022-09-29 21:28:41 +08:00
Nick Cao
945ab9315d
qt6.qthttpserver: init at 6.4.0 2022-09-29 21:19:28 +08:00