electron_{33,34}: fix build by adding patch to use adler2 lib

This commit is contained in:
TomaSajt
2025-04-06 19:32:44 +02:00
parent 295f117d50
commit c22285ed1e
3 changed files with 11 additions and 6 deletions

View File

@@ -520,9 +520,6 @@ let
revert = true;
hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
})
]
++ lib.optionals (chromiumVersionAtLeast "134" && lib.versionOlder rustcVersion "1.86") [
./patches/chromium-134-rust-adler2.patch
];
postPatch =

View File

@@ -83,7 +83,15 @@ in
src = null;
patches = base.patches;
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
];
unpackPhase =
''

View File

@@ -6,8 +6,8 @@ index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
- "adler2",
+ "adler",
- "adler",
+ "adler2",
"gimli",
"libc",
"memchr",