Skip to content

electron-{source,bin}: various cleanups #388242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuyuyureka merged 2 commits into from
Mar 12, 2025
Merged

electron-{source,bin}: various cleanups #388242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae5cd44
electron_34-bin: remove fix for read out of range on aarch64 16k page…
teutat3s Mar 8, 2025
7e36a95
electron-source: cleanup unused patch for electron 32
teutat3s Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions pkgs/development/tools/electron/binary/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,6 @@ let
vulkan-loader
];

# Fix read out of range on aarch64 16k pages builds
# https://github.com/NixOS/nixpkgs/pull/365364
# https://github.com/NixOS/nixpkgs/pull/380991
# Can likely be removed when v34.2.1 (or v32.3.0?) releases:
# https://github.com/electron/electron/pull/45571
needsAarch64PageSizeFix = lib.versionAtLeast version "34" && stdenv.hostPlatform.isAarch64;

linux = finalAttrs: {
buildInputs = [
glib
Expand Down Expand Up @@ -162,8 +155,7 @@ let

preFixup = ''
makeWrapper "$out/libexec/electron/electron" $out/bin/electron \
"''${gappsWrapperArgs[@]}" \
${lib.optionalString needsAarch64PageSizeFix "--add-flags '--js-flags=--no-decommit-pooled-pages'"}
"''${gappsWrapperArgs[@]}"
'';

postFixup = ''
Expand Down
6 changes: 1 addition & 5 deletions pkgs/development/tools/electron/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,7 @@ in

src = null;

patches =
base.patches
++ lib.optionals (lib.versions.major info.version == "32") [
./fix-electron-32-patch-apply-without-git-3way.patch
];
patches = base.patches;

unpackPhase =
''
Expand Down
73 changes: 0 additions & 73 deletions pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch
View file
Open in desktop

This file was deleted.