Skip to content

Commit

Permalink
cgit: use full path of groff in man2html
Browse files Browse the repository at this point in the history
groff may not be installed system-wide or may be outside cgit's path
(e.g. when running cgit using uwsgi). As a result, the man2html filter
fails. Replace groff by its full path in man2html.

(cherry picked from commit bbcf5eb)
  • Loading branch information
danieldk authored and Mic92 committed Sep 9, 2018
1 parent b68bfbc commit 7d404b9
Showing 1 changed file with 4 additions and 1 deletion.
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkgconfig, luajit
, gzip, bzip2, xz
, groff, gzip, bzip2, xz
, python, wrapPython, pygments, markdown
}:

Expand Down Expand Up @@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-i ui-snapshot.c
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
'';

# Give cgit a git source tree and pass configuration parameters (as make
Expand Down

0 comments on commit 7d404b9

Please sign in to comment.