From 4f0917ea13ca9b33997d1dd791c2280c3e8c2be0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 19 Aug 2025 12:18:27 +0200 Subject: [PATCH] electron: clean up unused patches --- pkgs/development/tools/electron/common.nix | 20 ------------------- .../tools/electron/use-rust-adler2.patch | 13 ------------ 2 files changed, 33 deletions(-) delete mode 100644 pkgs/development/tools/electron/use-rust-adler2.patch diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 44c4ea2c62a0..f2a2c60da5a8 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -86,26 +86,6 @@ in patches = base.patches - # Fix building with Rust 1.86+ - # electron_33 and electron_34 use older chromium versions which expect rust - # to provide the older `adler` library instead of the newer `adler2` library - # This patch makes those older versions also use the new adler2 library - ++ lib.optionals (lib.versionOlder info.version "35") [ - ./use-rust-adler2.patch - ] - # Requirements for the next section - ++ lib.optionals (lib.versionOlder info.version "35") [ - (fetchpatch { - name = "Avoid-build-rust-PartitionAlloc-dep-when-not-build_with_chromium.patch"; - url = "https://github.com/chromium/chromium/commit/ee94f376a0dd642a93fbf4a5fa8e7aa8fb2a69b5.patch"; - hash = "sha256-qGjy9VZ4d3T5AuqOrBKEajBswwBU/7j0n80rpvHZLmM="; - }) - (fetchpatch { - name = "Suppress-unsafe_libc_call-warning-for-rust-remap_alloc-cc.patch"; - url = "https://github.com/chromium/chromium/commit/d5d79d881e74c6c8630f7d2f3affd4f656fdeb4e.patch"; - hash = "sha256-1oy5WRvNzKuUTJkt8kULUqE4JU+EKEV1PB9QN8HF4SE="; - }) - ] # Fix building with Rust 1.87+ # https://issues.chromium.org/issues/407024458 ++ lib.optionals (lib.versionOlder info.version "37") [ diff --git a/pkgs/development/tools/electron/use-rust-adler2.patch b/pkgs/development/tools/electron/use-rust-adler2.patch deleted file mode 100644 index 7a7bdacecd3d..000000000000 --- a/pkgs/development/tools/electron/use-rust-adler2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644 ---- a/build/rust/std/BUILD.gn -+++ b/build/rust/std/BUILD.gn -@@ -89,7 +89,7 @@ if (toolchain_has_rust) { - # These are no longer present in the Windows toolchain. - stdlib_files += [ - "addr2line", -- "adler", -+ "adler2", - "gimli", - "libc", - "memchr",