Merge branch 'master' into staging

2018-12-24 15:02:29 +01:00
parent d5d15828b5 dd3eea4b47
commit ef935fa101
336 changed files with 5417 additions and 2469 deletions
@@ -119,7 +119,8 @@ stdenv.mkDerivation rec {
      find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
        substituteInPlace "$path" \
          --replace /bin/bash ${customBash}/bin/bash \
-          --replace /usr/bin/env ${coreutils}/bin/env
+          --replace /usr/bin/env ${coreutils}/bin/env \
+          --replace /bin/true ${coreutils}/bin/true
      done
      # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
      substituteInPlace scripts/bootstrap/compile.sh \