diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index e5503e9d4cd..15e759c8b62 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 @@ -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 @@ -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}''} ) ''; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7b9de01b752..0229d92d9a2 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 @@ -133,6 +134,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] + ++ optional stdenv.isLinux "-webengine-webrtc-pipewire" ++ optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -165,6 +167,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