From 2a087141cb93b9c90c885ee63010dfcd108be3bc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 15 Feb 2008 11:14:40 +0000
Subject: [PATCH] Ported replace renaming to replace-literal to avoid conflict
 with MySQL package supplying own tool with name replace.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10704
---
 pkgs/stdenv/generic/setup.sh        | 2 +-
 pkgs/tools/system/cron/default.nix  | 2 +-
 pkgs/tools/text/replace/default.nix | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 34e4e0fd902..4f40c3ee562 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -281,7 +281,7 @@ substitute() {
         args[${#args[@]}]="$replacement"
     done
 
-    replace -e -s "${args[@]}" < "$input" > "$output".tmp
+    replace-literal -e -s "${args[@]}" < "$input" > "$output".tmp
     if test -x "$output"; then
         chmod +x "$output".tmp
     fi
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 066f594ea84..4d7dcb93db2 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   unpackCmd = "(mkdir cron && cd cron && sh $src)";
 
   preBuild = "
-    substituteInPlace Makefile --replace '-o root' '' --replace 111 755
+    substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
     makeFlags=\"DESTROOT=$out\"
   ";
 
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index b9613ef2077..ca96309e40e 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   makeFlags = "TREE=\$(out)";
 
+  postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
+
   meta = {
     homepage = http://replace.richardlloyd.org.uk/;
     description = "A tool to replace verbatim strings";