Merge pull request #247726 from vlaci/qtwebengine-pulse

qtwebengine: link to pulseaudio
2023-08-16 18:13:17 +03:00
parent c7f0d4e4e9 e4dcdb133a
commit c85be71df4
5 changed files with 22 additions and 0 deletions
@@ -170,6 +170,7 @@ let
        extraPrefix = "src/3rdparty/";
        hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM=";
      })
+      ./qtwebengine-link-pulseaudio.patch
    ] ++ lib.optionals stdenv.isDarwin [
      ./qtwebengine-darwin-no-platform-check.patch
      ./qtwebengine-mac-dont-set-dsymutil-path.patch
@@ -0,0 +1,8 @@
+--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
+@@ -47,3 +47,5 @@
+
+ !qtConfig(webengine-nodejs10): gn_args += use_rollup=false
+ gn_args += enable_ipc_logging=false
+
+gn_args += link_pulseaudio=true
@@ -9,6 +9,7 @@
 , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
 , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
 , alsa-lib
+, pulseaudio
 , libcap
 , pciutils
 , systemd
@@ -145,6 +146,7 @@ qtModule {

    # Audio formats
    alsa-lib
+    pulseaudio

    # Text rendering
    fontconfig freetype
@@ -135,6 +135,7 @@ qtModule {
    # environment variable, since NixOS relies on it working.
    # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
    ../patches/qtwebengine-xkb-includes.patch
+    ../patches/qtwebengine-link-pulseaudio.patch
  ];

  postPatch = ''
@@ -0,0 +1,10 @@
+--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
+@@ -341,6 +341,7 @@
+             devtools_fast_bundle=false
+             devtools_skip_typecheck=false
+             enable_jxl_decoder=false # temporarily because libjxl causes internal compiler error on armv7
+            link_pulseaudio=true
+         )
+
+         extend_gn_list(gnArgArg