diff options
| author | Peter Simons <simons@cryp.to> | 2013-04-20 10:00:27 -0700 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-04-20 10:00:27 -0700 |
| commit | f61dcf877767c889f8acf15e985b122beaa4d002 (patch) | |
| tree | bcace3196706bb3d29292c43a907c811e8ecf89b /pkgs/applications | |
| parent | 96e8703be0ee43b78bbe0923581f7415cf93c724 (diff) | |
| parent | 88f1e643e348e5073290732b558c7a345fffd0aa (diff) | |
| download | nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar.gz nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar.bz2 nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar.lz nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar.xz nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.tar.zst nixlib-f61dcf877767c889f8acf15e985b122beaa4d002.zip | |
Merge pull request #472 from bjornfor/git
git: fix gitweb.cgi runtime dependency on gzip
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b6d7c1eb5d3b..81362ec4d04d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,7 +10,7 @@ rec { git = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversionClient hardlink; + cpio tcl tk makeWrapper subversionClient hardlink gzip; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b006354a0149..30611f40f07b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep +{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, hardlink , svnSupport, subversionClient, perlLibs, smtpPerlLibs @@ -66,6 +66,11 @@ stdenv.mkDerivation { sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \ -e 's| perl -e| ${perl}/bin/perl -e|g' \ $out/libexec/git-core/{git-am,git-submodule} + + # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for + # gitweb.cgi, need to patch so that it's found + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ + $out/share/gitweb/gitweb.cgi '' + (if svnSupport then |