Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
@@ -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