diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-20 22:56:31 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-20 22:56:31 +0000 |
| commit | efe5ab73b19c0c8c769afa9433db2d8f90840360 (patch) | |
| tree | 65892d0d1e78379d64aa30831e206e89c17eb2d0 /pkgs/applications/version-management/git-and-tools | |
| parent | 62eab9e44ae9d6224bd99b773fe0f5fc4a946920 (diff) | |
| download | nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar.gz nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar.bz2 nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar.lz nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar.xz nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.tar.zst nixpkgs-efe5ab73b19c0c8c769afa9433db2d8f90840360.zip | |
git: fixed impure path to perl in git-am and git-submodule
svn path=/nixpkgs/trunk/; revision=27859
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
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 |