summary refs log tree commit diff
diff options
context:
space:
mode:
authorgnidorah <gnidorah@users.noreply.github.com>2018-03-19 21:42:25 +0300
committergnidorah <gnidorah@users.noreply.github.com>2018-03-19 21:42:25 +0300
commit55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec (patch)
treeb04db0568c510240df1eb67e091b4949d3c3ebdc
parent242abf396f978d76b0c6de034681f30f2498a8c2 (diff)
downloadnixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar.gz
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar.bz2
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar.lz
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar.xz
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.tar.zst
nixlib-55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec.zip
cgit: wrap python scripts
-rw-r--r--pkgs/applications/version-management/git-and-tools/cgit/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 8 insertions, 2 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 3c7d0a86be04..d890001489ff 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_xml_xslt, pkgconfig, luajit
 , gzip, bzip2, xz
+, python, wrapPython, pygments, markdown
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +21,11 @@ stdenv.mkDerivation rec {
     sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
   buildInputs = [
     openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
   ];
+  pythonPath = [ pygments markdown ];
 
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
     a2x --no-xmllint -f manpage cgitrc.5.txt
     mkdir -p "$out/share/man/man5"
     cp cgitrc.5 "$out/share/man/man5"
+
+    wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5540e1fe581..03a572c22312 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14880,7 +14880,9 @@ with pkgs;
 
   centerim = callPackage ../applications/networking/instant-messengers/centerim { };
 
-  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+  cgit = callPackage ../applications/version-management/git-and-tools/cgit {
+    inherit (python3Packages) python wrapPython pygments markdown;
+  };
 
   cgminer = callPackage ../applications/misc/cgminer {
     amdappsdk = amdappsdk28;