Commit Graph

209 Commits

Author SHA1 Message Date
Kevin Puetz
7e886531a2 qt6.qtmultimedia: Fix failure to load libva.so
QtMultimedia 6.6.0 would select dynamic VAAPI on linux, then warns
during build (even though it chose this on purpose):

> QT_FEATURE_vaapi is found but ffmpeg doesn't include vaapi,
> however dynamic symbols resolve is possible

The nuisance warning was fixed for 6.7 and backported to 6.6.1:
https://codereview.qt-project.org/c/qt/qtmultimedia/+/517333

However, tracing it helped me figure out why vaapi actually wasn't
working: nix doesn't end up with an rpath such that dlopen("va")
can actually find libva.so in the nix store, thus failing at runtime:

> qt.multimedia.plugin: loading backend "ffmpeg"
> qt.core.library: "/nix/store/i9fkjks6dfjj1p9qvj5633sxbrf5rbd8-qtmultimedia-6.6.1/lib/qt-6/plugins/multimedia/libffmpegmediaplugin.so" loaded library
> qt.multimedia.ffmpeg.libsymbolsresolver: Start VAAPI symbols resolving: 39 symbols
> qt.core.library: "va" cannot load: Cannot load library va: (va: cannot open shared object file: No such file or directory)
> qt.multimedia.ffmpeg.libsymbolsresolver: Couldn't load VAAPI library
2023-12-03 16:59:01 -06:00
Kevin Puetz
d3de574b8c qt6.qtmultimedia: Compile hardware-accelerated VAAPI 2023-12-03 16:58:59 -06:00
Kevin Puetz
91b8e472a5 qt6.qtmultimedia: Compile ffmpeg multimedia plugin
This is now the default recommendation upstream for linux platforms

> https://doc.qt.io/qt-6.6/qtmultimedia-index.html#ffmpeg-as-the-default-backend
> In this release the FFmpeg framework is set as the default backend on
> Windows, macOS, Android, and Linux except Yocto distribution.

> The version shipped with Qt binary packages is FFmpeg 6.0
> and is tested by the maintainers.

libXrandr is required to compile support QT_WINDOW_CAPTURE_BACKEND=x11
2023-12-03 16:58:28 -06:00
Kevin Puetz
0ebea89551 qt6.qtmultimedia: Enable Spatial Audio (Quick3D)
This was Tech Preview in Qt 6.4, released in 6.5
2023-12-03 16:34:30 -06:00
Nick Cao
64c132c427
qt6.qtbase: fix build on older macOS 2023-11-27 16:22:18 -05:00
Nick Cao
b30aa72d57
qt6.qtwayland: drop outdated patches 2023-11-27 11:18:03 -05:00
Nick Cao
4b8fb7d6da
qt6.qtsvg: drop outdated patches 2023-11-27 11:03:44 -05:00
Nick Cao
da08600073
qt6.qtbase: derive plugin load path from PATH 2023-11-27 10:42:10 -05:00
Nick Cao
53ad6fd1b4
qt6.qtbase: refresh patches 2023-11-27 10:37:13 -05:00
Nick Cao
3e46f20afe
qt6: 6.6.0 -> 6.6.1 2023-11-27 10:33:46 -05:00
Lorenz Brun
0e4a87f4dd qt6.qtwebengine: set correct platforms
Qt WebEngine is built on Chromium, which only supports a limited set
of platforms. Set these here to stop attempts at building for other
platforms.
2023-11-25 12:21:27 +01:00
Artturin
65874cc847 qt6: dont use with self
improves cross-compilation support

matches qt5 set
2023-11-24 04:19:39 +02:00
Artturin
1231b72e01 qt6: use makeScopeWithSplicing 2023-11-24 04:16:53 +02:00
Nick Cao
80e1bce562
qt6.qtwayland: fix a crash issue with popup/submenus 2023-11-20 08:55:38 -05:00
github-actions[bot]
6cc772a6fa
Merge master into staging-next 2023-11-14 18:01:11 +00:00
oxalica
7cf2539472
qt6Packages.qtwayland: fix a freezing bug with fcitx5 2023-11-14 19:19:00 +08:00
github-actions[bot]
6e287cb9de
Merge master into staging-next 2023-11-05 00:02:23 +00:00
Artturin
01d9c8d1bc treewide: change readded overrideScope''s to overrideScope
`overrideScope'` has been renamed to `overrideScope`
2023-11-04 23:28:04 +02:00
Randy Eckenrode
3f3a594249
qt6.qtwebengine: fix build with clang 16
Specify a deployment target of 10.13 to avoid errors due to clang’s
having a hard-coded check for 10.13 when using them (even though it
implements them with `posix_memalign`, which is available on earlier
versions of macOS).
2023-10-31 00:18:54 -04:00
Randy Eckenrode
1c1ce083f7
qt6.qtwebengine: fix QtWebEngine build crash
QtWebEngine tries to build with clang 14, which links libc++ 14, but the
top-level libc++ on Dariwn is libc++ 16. This results in a crash during
the build, which is fixed by building with the default stdenv.
2023-10-30 22:25:49 -04:00
github-actions[bot]
4b9cf6ff6e
Merge master into staging-next 2023-10-19 00:02:21 +00:00
Weijia Wang
14c9544e25 qt6.qtwebengine: fix platform detection on darwin 2023-10-18 23:24:09 +02:00
Weijia Wang
931baddf22 qt6.qtgraphs: qtInputs -> propagatedBuildInputs 2023-10-13 18:18:02 +02:00
github-actions[bot]
8a68e0b5f5
Merge master into staging-next 2023-10-13 06:01:14 +00:00
Nick Cao
2de11a7688
qt6.qtsvg: add patch for QTBUG-117944 2023-10-12 09:30:58 -04:00
Nick Cao
1afbd8c284
qt6.qtwebengine: refresh patches for qt 6.6.0 2023-10-12 09:30:50 -04:00
Nick Cao
998fa6daa5
qt6.qtgraphs: init at 6.6.0 2023-10-12 09:30:49 -04:00
Nick Cao
539cb44879
qt6.qtgrpc: drop outdated patches 2023-10-12 09:30:48 -04:00
Nick Cao
cced34436c
qt6.qtdeclarative: refresh patches for qt 6.6.0 2023-10-12 09:30:47 -04:00
Nick Cao
76e234836a
qt6.qttools: drop incorrect references to CMAKE_INSTALL_INCLUDEDIR 2023-10-12 09:30:46 -04:00
Nick Cao
5f3c3c43a8
qt6.qtbase: refresh patches for qt 6.6.0 2023-10-12 09:30:45 -04:00
Nick Cao
6b0b44ae8e
qt6.qtmqtt: 6.5.3 -> 6.6.0 2023-10-12 09:30:44 -04:00
Nick Cao
367aae2e1c
qt6: 6.5.3 -> 6.6.0 2023-10-12 09:30:39 -04:00
github-actions[bot]
50751b0602
Merge master into staging-next 2023-09-29 18:00:55 +00:00
Nick Cao
e38dd213af
qt6.qtgrpc: update patch for protobuf 23 2023-09-28 13:53:58 -04:00
Nick Cao
a93d915ed5
qt6: 6.5.2 -> 6.5.3 2023-09-28 12:33:11 -04:00
github-actions[bot]
983c998105
Merge staging-next into staging 2023-09-19 00:02:48 +00:00
Nick Cao
7efb824dac
qt6.qtgrpc: add patch for protobuf 23 support 2023-09-18 09:49:57 -04:00
Alyssa Ross
aae53c8f97
qt5.qtModule,qt6.qtModule: deprecate qtInputs
This is just an alias for propagatedBuildInputs.  Having two names for
the same thing just makes things confusing.
2023-09-17 07:04:59 +00:00
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
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