Skip to content

Commit

Permalink
qutebrowser: re-add option to control the browser backend
Browse files Browse the repository at this point in the history
  • Loading branch information
rnhmjoj committed Jul 17, 2020
1 parent 3ecbb6a commit 322d13e
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions pkgs/applications/networking/browsers/qutebrowser/default.nix
Expand Up @@ -2,8 +2,9 @@
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
, libxslt, gst_all_1 ? null
, withPdfReader ? true
, withMediaPlayback ? true
, withPdfReader ? true
, withMediaPlayback ? true
, backend ? "webkit"
}:

assert withMediaPlayback -> gst_all_1 != null;
Expand All @@ -19,6 +20,14 @@ let
stripRoot = false;
};

backendPackage =
if backend == "webengine" then python3Packages.pyqtwebengine else
if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else
throw ''
Unknown qutebrowser backend "${backend}".
Valid choices are qtwebengine (recommended) or qtwebkit.
'';

in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "1.13.0";
Expand Down Expand Up @@ -46,16 +55,14 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
];

propagatedBuildInputs = with python3Packages; [
pyyaml pyqt5 pyqtwebengine jinja2 pygments
pyyaml backendPackage jinja2 pygments
pypeg2 cssutils pyopengl attrs setuptools
# scripts and userscripts libs
tldextract beautifulsoup4
pyreadability pykeepass stem
];

patches = [
./fix-restart.patch
];
patches = [ ./fix-restart.patch ];

dontWrapGApps = true;
dontWrapQtApps = true;
Expand Down Expand Up @@ -101,7 +108,8 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
postFixup = ''
wrapProgram $out/bin/qutebrowser \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}"
"''${qtWrapperArgs[@]}" \
--add-flags '--backend ${backend}'
'';

meta = with stdenv.lib; {
Expand Down

0 comments on commit 322d13e

Please sign in to comment.