From eafbd542ed0e721c4faae46adbe58419bbaa0f95 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 12 Oct 2022 01:24:28 -0600 Subject: qutebrowser-qt6: fix help command Fixes #195626 The unstable qt6 build requires invoking the doc builder before setup.py is called in order to have it properly installed. Also added pygments as a missing doc build dependency. --- .../networking/browsers/qutebrowser/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c4327901d73..27dd55fc787 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -75,7 +75,8 @@ buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - ]; + ] + ++ lib.optional isQt6 python3Packages.pygments; propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments @@ -97,6 +98,12 @@ buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; + preConfigure = '' + a2x -f manpage doc/qutebrowser.1.asciidoc + '' + lib.optionalString isQt6 '' + python scripts/asciidoc2html.py + ''; + postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -105,10 +112,6 @@ buildPythonApplication { sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; - postBuild = '' - a2x -f manpage doc/qutebrowser.1.asciidoc - ''; - postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ -- cgit 1.4.1