Unverified Commit c85be71d authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #247726 from vlaci/qtwebengine-pulse 

qtwebengine: link to pulseaudio
parents c7f0d4e4 e4dcdb13

pkgs/development/libraries/qt-5/5.15/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch

0 → 100644
+8 −0
Original line number Diff line number Diff line 
--- 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

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/qt-6/modules/qtwebengine.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- 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
 
 No newline at end of file