diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 025e4522f065..a94b0973949f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,10 +2,13 @@ , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins -, withWebEngineDefault ? false +, qtwebkit-plugins ? null +, attrs +, withWebEngineDefault ? true }: +assert (! withWebEngineDefault) -> qtwebkit-plugins != null; + let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; @@ -26,29 +29,30 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.11.0"; + version = "1.0.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; + sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs"; }; # Needs tox doCheck = false; buildInputs = [ - qtbase qtwebkit-plugins + qtbase gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav glib_networking - ]; + ] + ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; nativeBuildInputs = [ makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs ]; postPatch = '' @@ -62,7 +66,7 @@ in buildPythonApplication rec { postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 qutebrowser.desktop \ + install -Dm644 misc/qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" for i in 16 24 32 48 64 128 256 512; do install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ @@ -73,8 +77,8 @@ in buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; - postFixup = lib.optionalString withWebEngineDefault '' - wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine" + postFixup = lib.optionalString (! withWebEngineDefault) '' + wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a53de95c827..86998d80eb2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16190,7 +16190,7 @@ with pkgs; falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; };