Unverified Commit 2057486d authored by Timothy DeHerrera's avatar Timothy DeHerrera
Browse files

qutebrowser: remove webkit support 

WebKit support will soon be dropped upstream. Also removes the media
plugin codepath, which was only used by webkit.
parent 679f2b64

pkgs/applications/networking/browsers/qutebrowser/default.nix

+3 −17
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, fetchzip, python3

, wrapQtAppsHook, glib-networking

, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2

, libxslt, gst_all_1 ? null

, libxslt

, withPdfReader      ? true

, withMediaPlayback  ? true

, backend            ? "webengine"

, pipewireSupport    ? stdenv.isLinux

, pipewire

, qtwayland

, qtbase

, qtwebengine

, wrapGAppsHook

, enableWideVine ? false

, widevine-cdm

, enableVulkan ? stdenv.isLinux
@@ -31,12 +28,6 @@ let 
  version = "3.0.0";

in



assert withMediaPlayback -> gst_all_1 != null;

assert lib.assertMsg (backend != "webkit") ''

  Support for the QtWebKit backend has been removed.

  Please remove the `backend = "webkit"` option from your qutebrowser override.

'';



python3.pkgs.buildPythonApplication {

  inherit pname version;

  src = fetchurl {
@@ -50,13 +41,10 @@ python3.pkgs.buildPythonApplication { 
  buildInputs = [

    qtbase

    glib-networking

  ] ++ lib.optionals withMediaPlayback (with gst_all_1; [

    gst-plugins-base gst-plugins-good

    gst-plugins-bad gst-plugins-ugly gst-libav

  ]);

  ];



  nativeBuildInputs = [

    wrapQtAppsHook wrapGAppsHook asciidoc

    wrapQtAppsHook asciidoc

    docbook_xml_dtd_45 docbook_xsl libxml2 libxslt

    python3.pkgs.pygments

  ];
@@ -76,7 +64,6 @@ python3.pkgs.buildPythonApplication { 
    ./fix-restart.patch

  ];



  dontWrapGApps = true;

  dontWrapQtApps = true;



  postPatch = ''
@@ -114,7 +101,6 @@ python3.pkgs.buildPythonApplication { 
  in

    ''

    makeWrapperArgs+=(

      "''${gappsWrapperArgs[@]}"

      "''${qtWrapperArgs[@]}"

      ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}

      ${lib.optionalString (enableVulkan) ''