diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-05 13:06:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-05 13:06:02 -0700 |
| commit | d605663ae287ea0f0bfc2e802ae276ab720da71e (patch) | |
| tree | c4eae3b9be5c196b51b788aedab2f3a7dc2b5bb1 /pkgs/tools/X11/xdg-utils/default.nix | |
| parent | 236366019187b5fbe568764ade67ae034cac796e (diff) | |
| parent | 2d1aafef553ce7fbb854def7fd20a7e799b653c4 (diff) | |
| download | nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.gz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.bz2 nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.lz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.xz nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.tar.zst nixlib-d605663ae287ea0f0bfc2e802ae276ab720da71e.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/X11/xdg-utils/default.nix')
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 4e42cc0e5e6d..6f306a868911 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace $item --replace "cut " "${coreutils}/bin/cut " substituteInPlace $item --replace "sed " "${gnused}/bin/sed " substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep " - sed -i $item -e "s#[^e]grep #${gnugrep}/bin/grep #g" # Don't replace 'egrep' + sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep' substituteInPlace $item --replace "which " "${which}/bin/which " substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file" done |