diff options
| author | Timothy DeHerrera <tim@nrdxp.dev> | 2023-04-30 10:33:15 -0600 |
|---|---|---|
| committer | Timothy DeHerrera <tim@nrdxp.dev> | 2023-10-24 17:15:25 -0600 |
| commit | 2057486da7a21bfa596e8694dd5552d9f1e4df09 (patch) | |
| tree | 6ebfb42b86b12854e41c6d5342fecf79fb0fb65b /pkgs/applications/networking | |
| parent | 679f2b64e12bd27835091c89ae0b59279d516680 (diff) | |
| download | nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar.gz nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar.bz2 nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar.lz nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar.xz nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.tar.zst nixpkgs-2057486da7a21bfa596e8694dd5552d9f1e4df09.zip | |
qutebrowser: remove webkit support
WebKit support will soon be dropped upstream. Also removes the media plugin codepath, which was only used by webkit.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 19f2885b048..c7c2b3672ec 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,16 +1,13 @@ { 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) '' |