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

@@ -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

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\"
   ";
 

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";