Author: egorochkin
Date: Sat Sep 18 12:45:04 2010
New Revision: 23853
URL: https://svn.nixos.org/websvn/nix/?rev=23853&sc=1
Log:
Git: fix an impurity: was taking grep from PATH.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Sep 18 12:44:03 2010 (r23852)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Sep 18 12:45:04 2010 (r23853)
@@ -9,7 +9,7 @@
rec {
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
docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion;
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Sat Sep 18 12:44:03 2010 (r23852)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Sat Sep 18 12:45:04 2010 (r23853)
@@ -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
, libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs, smtpPerlLibs
@@ -45,6 +45,11 @@
echo "installing Emacs mode..."
ensureDir $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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
