diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
| commit | 612f0bdd679e16bd05397c85de9ea4b147cb45dc (patch) | |
| tree | 68f50e65ea610c52a60ab9bb3b6fe27006db368d /pkgs/tools/X11/xdg-utils/default.nix | |
| parent | 857efa12fb54a05674406fafcdc43b0576d17eb2 (diff) | |
| parent | ddf15bc78a869ec61487aa20edd4e8d9ba044519 (diff) | |
| download | nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.gz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.bz2 nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.lz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.xz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.zst nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.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 f90de89adbdb..4e42cc0e5e6d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { for item in $out/bin/*; do substituteInPlace $item --replace "cut " "${coreutils}/bin/cut " substituteInPlace $item --replace "sed " "${gnused}/bin/sed " - substituteInPlace $item --replace "grep " "${gnugrep}/bin/grep " substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep " + sed -i $item -e "s#[^e]grep #${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 |