From efe5ab73b19c0c8c769afa9433db2d8f90840360 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jul 2011 22:56:31 +0000 Subject: [PATCH] git: fixed impure path to perl in git-am and git-submodule svn path=/nixpkgs/trunk/; revision=27859 --- .../version-management/git-and-tools/git/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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 7d51573bad2..ee207788875 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/git-core/git-sh-setup \ --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' + + # Fix references to the perl binary. Note that the tab character + # in the patterns is important. + 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} '' + (if svnSupport then