about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-04-10 01:36:34 +0200
committerGitHub <noreply@github.com>2024-04-10 01:36:34 +0200
commit1b2b853cd74e22399de39f9ddb5b77773238c7d3 (patch)
tree9bf88f6845a30ba8169bafae76e757be9083c217
parente2a6a9d56e968226e02b30bd08add7f4d4cb04c9 (diff)
electron: exclude patch of removed tests (#302961)
Closes https://github.com/NixOS/nixpkgs/issues/302457

(cherry picked from commit a02021a52e31b5032661dfdb7231391429717632)

Co-authored-by: Mitchell Skaggs <skaggsm333@gmail.com>
-rw-r--r--pkgs/development/tools/electron/common.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index ea69c7ccfc163..571ac94f3d182 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -133,7 +133,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
         for patch in $(cat $patch_dir/.patches)
         do
           echo applying in $repo: $patch
-          git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' $patch_dir/$patch
+          git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*' $patch_dir/$patch
         done
       done
     )