diff options
author | Daniël de Kok <me@danieldk.eu> | 2018-09-09 14:37:30 +0200 |
---|---|---|
committer | Daniël de Kok <me@danieldk.eu> | 2018-09-09 14:37:30 +0200 |
commit | bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02 (patch) | |
tree | 2f2d144efb9ee49aec409e7caef7ac0e217d0896 /pkgs/applications/version-management/git-and-tools | |
parent | dfcf07d9d381f1911ac9117d5f477b83f444a03f (diff) | |
download | nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar.gz nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar.bz2 nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar.lz nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar.xz nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.tar.zst nixlib-bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02.zip |
cgit: use full path of groff in man2html
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.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/cgit/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 3fb227909040..5bfd74344e8c 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -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 }: @@ -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 |