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

cgit: use full path of groff in man2html

Browse Source 
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.
This commit is contained in:
Daniël de Kok 2018-09-09 14:37:30 +02:00
parent dfcf07d9d3
commit bbcf5eb130
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkgconfig, luajit , docbook_xsl, pkgconfig, luajit
, gzip, bzip2, xz , groff, gzip, bzip2, xz
, python, wrapPython, pygments, markdown , python, wrapPython, pygments, markdown
}: }:
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \
-i ui-snapshot.c -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 # Give cgit a git source tree and pass configuration parameters (as make