From 4965343da0fbfd5b5842c5341b130710c090d116 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 11 Jun 2019 01:10:01 +0200 Subject: cgit: patch and wrap filters --- .../version-management/git-and-tools/cgit/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 5bfd74344e8c..b3941809fb4c 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,7 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit -, groff, gzip, bzip2, xz +, coreutils, gnused, groff, docutils +, gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -35,6 +36,9 @@ stdenv.mkDerivation rec { substituteInPlace filters/html-converters/man2html \ --replace 'groff' '${groff}/bin/groff' + + substituteInPlace filters/html-converters/rst2html \ + --replace 'rst2html.py' '${docutils}/bin/rst2html.py' ''; # Give cgit a git source tree and pass configuration parameters (as make @@ -57,6 +61,10 @@ stdenv.mkDerivation rec { cp cgitrc.5 "$out/share/man/man5" wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + + for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do + wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' + done ''; meta = { -- cgit 1.4.1