diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/qutebrowser/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 5283d2e3c5df..05eafb48e721 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchzip, python3Packages -, makeWrapper, wrapGAppsHook, qtbase, glib-networking +, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "1.10.100"; + version = "2.1.266"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; + sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby"; stripRoot = false; }; -in python3Packages.buildPythonApplication rec { +in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.3"; + version = "1.7.0"; # 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 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy"; + sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i"; }; # Needs tox @@ -41,7 +41,7 @@ in python3Packages.buildPythonApplication rec { ]); nativeBuildInputs = [ - makeWrapper wrapGAppsHook asciidoc + wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; @@ -57,6 +57,9 @@ in python3Packages.buildPythonApplication rec { ./fix-restart.patch ]; + dontWrapGApps = true; + dontWrapQtApps = true; + postPatch = '' substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -71,8 +74,8 @@ in python3Packages.buildPythonApplication rec { postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 misc/qutebrowser.desktop \ - "$out/share/applications/qutebrowser.desktop" + install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ + "$out/share/applications/org.qutebrowser.qutebrowser.desktop" # Install icons for i in 16 24 32 48 64 128 256 512; do @@ -95,6 +98,12 @@ in python3Packages.buildPythonApplication rec { done ''; + postFixup = '' + wrapProgram $out/bin/qutebrowser \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + meta = with stdenv.lib; { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; |