diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 77358518351..0e3e7205e1f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,31 +2,40 @@ , 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 ? "webengine" }: assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "2.3.200"; + version = "2.4.456"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q"; + sha256 = "02hpy96pi06gdq2s7n56ycm34d6d3gf8ly22y366np5vpwmc29rx"; 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.12.0"; + version = "1.13.1"; # 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 = "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1"; + sha256 = "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8"; }; # Needs tox @@ -46,22 +55,20 @@ 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; postPatch = '' - substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' @@ -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; { |