public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123724 from johnae/qutebrowser-pipewire 

qutebrowser: support for webrtc pipewire (needed for wayland native screen sharing support)
This commit is contained in:
Michele Guerini Rocco 2021-05-21 08:13:13 +02:00 committed by GitHub
parent 788deaad9d 602a6372a5
commit 80f883b71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, fetchzip, python3 { stdenv, lib, fetchurl, fetchzip, python3
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, pipewire_0_2
, libxslt, gst_all_1 ? null , libxslt, gst_all_1 ? null
, withPdfReader ? true , withPdfReader ? true
, withMediaPlayback ? true , withMediaPlayback ? true
@ -112,12 +112,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
done done
''; '';
preFixup = '' preFixup = let
libPath = lib.makeLibraryPath [ pipewire_0_2 ];
in
''
makeWrapperArgs+=( makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
"''${qtWrapperArgs[@]}" "''${qtWrapperArgs[@]}"
--add-flags '--backend ${backend}' --add-flags '--backend ${backend}'
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
) )
''; '';

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

@ -12,6 +12,7 @@
, libcap , libcap
, pciutils , pciutils
, systemd , systemd
, pipewire_0_2
, enableProprietaryCodecs ? true , enableProprietaryCodecs ? true
, gn , gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
@ -141,6 +142,7 @@ qtModule {
''; '';
qmakeFlags = [ "--" "-system-ffmpeg" ] qmakeFlags = [ "--" "-system-ffmpeg" ]
++ optional stdenv.isLinux "-webengine-webrtc-pipewire"
++ optional enableProprietaryCodecs "-proprietary-codecs"; ++ optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -173,6 +175,9 @@ qtModule {
# X11 libs # X11 libs
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
xorg.libXcomposite xorg.libXdamage libdrm xorg.libXcomposite xorg.libXdamage libdrm
# Pipewire
pipewire_0_2
] ]
# FIXME These dependencies shouldn't be needed but can't find a way # FIXME These dependencies shouldn't be needed but can't find a way