Merge master into staging-next

2021-04-21 18:13:29 +00:00
parent 2f8f1408fa b14062b75c
commit 799ebbc91d
4 changed files with 34 additions and 19 deletions
@@ -171,7 +171,10 @@ let
      )
    ];

-    postPatch = ''
+    postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
+      # Required for patchShebangs (unsupported):
+      chmod -x third_party/webgpu-cts/src/tools/deno
+    '' + ''
      # remove unused third-party
      for lib in ${toString gnSystemLibraries}; do
        if [ -d "third_party/$lib" ]; then