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

xdg-utils: replace commands more precisely

Browse Source 
Fix #13904, close #13908.
Previously many messages got clobbered. Now it should be better.

The solution is still relatively hacky, but I don't see how to improve
it without doing lots of work.
This commit is contained in:
Vladimír Čunát 2016-03-14 10:57:08 +01:00
parent fa50a1f117
commit 1df2a6431f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -28,18 +28,17 @@ stdenv.mkDerivation rec {
postInstall = stdenv.lib.optionalString mimiSupport '' postInstall = stdenv.lib.optionalString mimiSupport ''
cp ${mimisrc}/xdg-open $out/bin/xdg-open cp ${mimisrc}/xdg-open $out/bin/xdg-open
substituteInPlace $out/bin/xdg-open --replace "awk " "${gawk}/bin/awk " ''
substituteInPlace $out/bin/xdg-open --replace "sort " "${coreutils}/bin/sort " + ''
substituteInPlace $out/bin/xdg-open --replace "(file " "(${file}/bin/file " for tool in "${coreutils}/bin/cut" "${gnused}/bin/sed" \
'' + '' "${gnugrep}"/bin/{e,}grep "${file}/bin/file" \
for item in $out/bin/*; do ${stdenv.lib.optionalString mimiSupport
substituteInPlace $item --replace "cut " "${coreutils}/bin/cut " '' "${gawk}/bin/awk" "${coreutils}/bin/sort" ''} ;
substituteInPlace $item --replace "sed " "${gnused}/bin/sed " do
substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep " sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/*
sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep'
substituteInPlace $item --replace "which " "type -P "
substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
done done
sed 's# which # type -P #g' -i "$out"/bin/*
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {