public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ported replace renaming to replace-literal to avoid conflict with MySQL package supplying own tool with name replace.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10704
This commit is contained in:
Michael Raskin 2008-02-15 11:14:40 +00:00
parent ca34aa0514
commit 2a087141cb
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/generic/setup.sh
View File

@ -281,7 +281,7 @@ substitute() {
args[${#args[@]}]="$replacement" args[${#args[@]}]="$replacement"
done done
replace -e -s "${args[@]}" < "$input" > "$output".tmp replace-literal -e -s "${args[@]}" < "$input" > "$output".tmp
if test -x "$output"; then if test -x "$output"; then
chmod +x "$output".tmp chmod +x "$output".tmp
fi fi

2
pkgs/tools/system/cron/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
unpackCmd = "(mkdir cron && cd cron && sh $src)"; unpackCmd = "(mkdir cron && cd cron && sh $src)";
preBuild = " preBuild = "
substituteInPlace Makefile --replace '-o root' '' --replace 111 755 substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
makeFlags=\"DESTROOT=$out\" makeFlags=\"DESTROOT=$out\"
"; ";

2
pkgs/tools/text/replace/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation {
makeFlags = "TREE=\$(out)"; makeFlags = "TREE=\$(out)";
postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
meta = { meta = {
homepage = http://replace.richardlloyd.org.uk/; homepage = http://replace.richardlloyd.org.uk/;
description = "A tool to replace verbatim strings"; description = "A tool to replace verbatim strings";