diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-19 23:23:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 23:23:44 +0000 |
| commit | e509181f056176c935e6061aa42d1dbe0a57a3ca (patch) | |
| tree | ecb4273e42f0fdb18eea4e17d9e59f685bafaa03 | |
| parent | 3539ca217975c0380ac2bf9ab7b6731a1aa3d6b3 (diff) | |
| parent | 55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec (diff) | |
| download | nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar.gz nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar.bz2 nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar.lz nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar.xz nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.tar.zst nixlib-e509181f056176c935e6061aa42d1dbe0a57a3ca.zip | |
Merge pull request #37384 from gnidorah/cgit
cgit: wrap python scripts
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/cgit/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
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 dc2c0a7da32b..c4c273b038cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14884,7 +14884,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; |