diff options
| author | K900 <me@0upti.me> | 2023-08-16 18:13:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 18:13:17 +0300 |
| commit | c85be71df497312de66b65df8d7ad7b5c0c81d04 (patch) | |
| tree | 308ccd3709c0d32ea23b9a9eb70eb12da76e2b10 /pkgs/development | |
| parent | c7f0d4e4e9af38da7dd578d90843b9cc695fc470 (diff) | |
| parent | e4dcdb133a290b11537a1ef6af4fde0b76cf8807 (diff) | |
Merge pull request #247726 from vlaci/qtwebengine-pulse
qtwebengine: link to pulseaudio
Diffstat (limited to 'pkgs/development')
5 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5ae5102abeee1..16be29ad529e8 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch new file mode 100644 index 0000000000000..052ec89dbc177 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.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 diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index d8d394444028e..1794e3f8ca678 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -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 diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 909616d953dee..0c243d4ba7a97 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -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 = '' diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch new file mode 100644 index 0000000000000..31516c41beb0e --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -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 \ No newline at end of file |