From 7a714e8ed2944f67f0df88130ebd145a9a31454e Mon Sep 17 00:00:00 2001 From: John Axel Eriksson Date: Wed, 19 May 2021 19:14:38 +0200 Subject: [PATCH 1/3] qtwebengine: enable pipewire/webrtc --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 571c17dc4cf..23ca50ba25a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -12,6 +12,7 @@ , libcap , pciutils , systemd +, pipewire_0_2 , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin @@ -141,6 +142,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] + ++ optional stdenv.isLinux "-webengine-webrtc-pipewire" ++ optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -173,6 +175,9 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm + + # Pipewire + pipewire_0_2 ] # FIXME These dependencies shouldn't be needed but can't find a way From 602a6372a56d1417280cb5cb87716e7dba5f9f3e Mon Sep 17 00:00:00 2001 From: John Axel Eriksson Date: Wed, 19 May 2021 19:15:17 +0200 Subject: [PATCH 2/3] qutebrowser: enable pipewire/webrtc (for wayland screensharing) --- .../networking/browsers/qutebrowser/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index e5503e9d4cd..f3799123e71 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, fetchzip, python3 +{ stdenv, lib, fetchurl, fetchzip, python3 , 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 , withPdfReader ? true , withMediaPlayback ? true @@ -112,12 +112,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { done ''; - preFixup = '' + preFixup = let + libPath = lib.makeLibraryPath [ pipewire_0_2 ]; + in + '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" "''${qtWrapperArgs[@]}" --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" + ${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} ) ''; From 2f3da3eb8175126c07af099f676050c027c8b629 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 20 May 2021 23:54:12 +0200 Subject: [PATCH 3/3] qutebrowser: 2.2.1 -> 2.2.2 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index e5503e9d4cd..53cefb2d8c5 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.2.1"; + version = "2.2.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-JHymxnNPdMsVma3TUKCS+iRCe9J7I0A6iISP5OXtJm8="; + sha256 = "11vjp20gzmdjj09b7wxzn7ar6viih0bk76y618yqsyqqkffylmbq"; }; # Needs tox