From 3dc3021d01b29035f540f6e7e7e33013a39ff4e8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 27 Sep 2007 14:48:09 +0000 Subject: [PATCH] Renamed replace executable to replace-literal (Yurii Kudryashov noticed conflict with MySQL) svn path=/nixpkgs/trunk/; revision=9376 --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 +- pkgs/tools/text/replace/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 6ad5349a6a7..f65b09f88d4 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -18,7 +18,7 @@ fixCmakeFiles() echo "Fixing cmake files" replaceArgs="-e -f -L -T /usr /FOO" replaceArgs="${replaceArgs} -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\"" - find $1 -type f -name "*.cmake" | xargs replace ${replaceArgs} + find $1 -type f -name "*.cmake" | xargs replace-literal ${replaceArgs} } cmakePostUnpack() diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index a2ca051e09e..3135204ef03 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = []; makeFlags = " TREE=\$(out) "; + postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; + meta = { description = " Replace verbatim strings. Sed is not fit to do it. Replace is.