diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-15 11:14:40 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-15 11:14:40 +0000 |
| commit | 2a087141cb93b9c90c885ee63010dfcd108be3bc (patch) | |
| tree | f800751b69356e25126d084acac78d3cba47b80e | |
| parent | ca34aa0514bc98592f70b47ebd57ced608d57133 (diff) | |
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
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/cron/default.nix | 2 | ||||
| -rw-r--r-- | 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 34e4e0fd90225..4f40c3ee5624e 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 066f594ea84bd..4d7dcb93db2be 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 b9613ef207723..ca96309e40ed2 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"; |