alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #37384 from gnidorah/cgit

Browse source 
cgit: wrap python scripts
This commit is contained in:
Jörg Thalheim 2018-03-19 23:23:44 +00:00 committed by GitHub
parent 3539ca2179 55f1bbe623
commit e509181f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file

@ -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 = {

4
pkgs/top-level/all-packages.nix
View file

@ -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;