colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #195636 from nrdxp/fix-qutebrowser-help

Browse Source 
qutebrowser-qt6: fix help command
This commit is contained in:
Timothy DeHerrera 2022-10-12 13:25:06 -06:00 committed by GitHub
commit 2e2a8a5a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -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 \