Author: simons
Date: Wed Jul 20 22:56:31 2011
New Revision: 27859
URL: https://svn.nixos.org/websvn/nix/?rev=27859&sc=1
Log:
git: fixed impure path to perl in git-am and git-submodule
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
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
Wed Jul 20 18:58:34 2011 (r27858)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Jul 20 22:56:31 2011 (r27859)
@@ -53,6 +53,12 @@
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
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
