Merge master into staging-next

2021-04-22 12:06:24 +00:00
parent 8248f4db36 a48ea1b0b3
commit 120744d620
78 changed files with 405 additions and 370 deletions
@@ -164,11 +164,6 @@ let
      ./patches/fix-missing-atspi2-dependency.patch
    ++ optionals (chromiumVersionAtLeast "91") [
      ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
-      (githubPatch
-        # Revert "Reland #7 of "Force Python 3 to be used in build.""
-        "38b6a9a8e5901766613879b6976f207aa163588a"
-        "1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
-      )
    ];

    postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''