b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
522033 commits 2 branches 0 tags 3.3 GiB
Commit graph

169 commits

Author SHA1 Message Date
K900 a27fe291a4 qt6.qtwebengine: use vendored re2 
Ours is too new and doesn't compile. The other removed inputs were unused already.
 2023-08-25 14:42:08 +03: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
Theodore Ni ece0953571
Merge branch 'staging-next' into staging 2023-08-18 16:02:27 -07: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 c85be71df4
Merge pull request #247726 from vlaci/qtwebengine-pulse 
qtwebengine: link to pulseaudio
 2023-08-16 18:13:17 +03:00
K900 4d0a76416f qt6.qtwebengine: don't try to install locales to qtbase translation directory 2023-08-15 22:11:10 +03:00
K900 0597d865ef qt6: include qttranslations properly 2023-08-15 22:11:10 +03:00
László Vaskó e4dcdb133a qtwebengine: link to pulseaudio 
Nix builds of QTWebEngine doesn't support sound output via Pulse, only
through ALSA, unless sandboxing is disabled and LD_LIBRARY_PATH
contains a reference to the Pulse libraries.

By default, Chromium won't link to PulseAudio, but dlopens it in
run-time. It is tricky to make this work because of the nontrivial
sandbox configuration. Nix builds of Chromium already link against
Pulse directly, so it makes sense to copy this behavior in
QTWebEngine.
 2023-08-14 19:33:19 +02: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
Nick Cao 1fb9945efd
qt6.qtmqtt: 6.5.1 -> 6.5.2 2023-07-23 12:56:23 +08:00
Nick Cao 1383fc0c1c
qt6: 6.5.1 -> 6.5.2 2023-07-20 12:47:27 +08:00
Nick Cao 8d28f8528e
Merge pull request #239781 from wineee/qttools 
qttools: disable clang-based c++ parser by default
 2023-06-27 09:18:33 +08:00
Weijia Wang 4f27b527b7 qt6.full: unlink qmake6 2023-06-26 20:05:02 +03:00
rewine 4e5204700c
qtdoc/qtcreator: use qttools with clang support 2023-06-26 23:00:43 +08:00
rewine d6cb6539a0
qttools: disable clang-based c++ parser by default 2023-06-26 23:00:34 +08:00
Weijia Wang 1447a5804b qt6.qtwebengine: unbreak on x86_64-darwin 2023-06-22 07:23:21 +03:00
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