diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-16 18:01:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 18:01:01 +0000 |
| commit | 583df4e091fa9f4ceb7cea453fb8f59fb6bd047f (patch) | |
| tree | fc77bdb5c2319330f23da865430a963b55fc3e38 /pkgs/development/libraries/qt-5/5.15 | |
| parent | ec1e6d834ae803f02a353914843e096c2091d233 (diff) | |
| parent | 13cb0c1af220467a25fd5e09ba823dc279f105cc (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch | 8 |
2 files changed, 9 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 |