public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git: fix an impurity: was taking grep from PATH. 

svn path=/nixpkgs/trunk/; revision=23853
This commit is contained in:
Evgeny Egorochkin 2010-09-18 12:45:04 +00:00
parent cfd73f3c41
commit 8ec9590737
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -9,7 +9,7 @@ in
rec { rec {
git = lib.makeOverridable (import ./git) { git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion; cpio tcl tk makeWrapper subversion;

7
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs, smtpPerlLibs , svnSupport, subversion, perlLibs, smtpPerlLibs
@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
echo "installing Emacs mode..." echo "installing Emacs mode..."
ensureDir $out/share/emacs/site-lisp ensureDir $out/share/emacs/site-lisp
cp -p contrib/emacs/*.el $out/share/emacs/site-lisp cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
# grep is a runtime dependence, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \
--replace ' grep' ' ${gnugrep}/bin/grep' \
--replace ' egrep' ' ${gnugrep}/bin/egrep'
'' # */ '' # */
+ (if svnSupport then + (if svnSupport then