Skip to content

Commit

Permalink
electron-source.electron_31: remove as it's EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
emilylange committed Jan 3, 2025
1 parent aa01edd commit 588c506
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 1,037 deletions.
30 changes: 1 addition & 29 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -458,32 +458,6 @@ let
# flag (declare_args) so we simply hardcode it to false.
./patches/widevine-disable-auto-download-allow-bundle.patch
]
++ lib.optionals (versionRange "127" "128") [
# Fix missing chrome/browser/ui/webui_name_variants.h dependency
# and ninja 1.12 compat in M127.
# https://issues.chromium.org/issues/345645751
# https://issues.chromium.org/issues/40253918
# https://chromium-review.googlesource.com/c/chromium/src/+/5641516
(githubPatch {
commit = "2c101186b60ed50f2ba4feaa2e963bd841bcca47";
hash = "sha256-luu3ggo6XoeeECld1cKZ6Eh8x/qQYmmKI/ThEhuutuY=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5644627
(githubPatch {
commit = "f2b43c18b8ecfc3ddc49c42c062d796c8b563984";
hash = "sha256-uxXxSsiS8R0827Oi3xsG2gtT0X+jJXziwZ1y8+7K+Qg=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5646245
(githubPatch {
commit = "4ca70656fde83d2db6ed5a8ac9ec9e7443846924";
hash = "sha256-iQuRRZjDDtJfr+B7MV+TvUDDX3bvpCnv8OpSLJ1WqCE=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5647662
(githubPatch {
commit = "50d63ffee3f7f1b1b9303363742ad8ebbfec31fa";
hash = "sha256-H+dv+lgXSdry3NkygpbCdTAWWdTVdKdVD3Aa62w091E=";
})
]
++ [
# Required to fix the build with a more recent wayland-protocols version
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
Expand Down Expand Up @@ -646,7 +620,7 @@ let
+ ''
# Link to our own Node.js and Java (required during the build):
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
ln -sf "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/
# Allow building against system libraries in official builds
Expand Down Expand Up @@ -751,8 +725,6 @@ let
use_system_libffi = true;
# Use nixpkgs Rust compiler instead of the one shipped by Chromium.
rust_sysroot_absolute = "${buildPackages.rustc}";
}
// lib.optionalAttrs (chromiumVersionAtLeast "127") {
rust_bindgen_root = "${buildPackages.rust-bindgen}";
}
// {
Expand Down
3 changes: 1 addition & 2 deletions pkgs/applications/networking/browsers/chromium/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ let
url = "https://gn.googlesource.com/gn";
inherit (upstream-info.deps.gn) rev hash;
};
}
// lib.optionalAttrs (chromiumVersionAtLeast "127") {

# Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
# cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];
Expand Down
36 changes: 1 addition & 35 deletions pkgs/development/tools/electron/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
chromium,
nodejs,
python3,
fetchpatch,
fetchYarnDeps,
fetchNpmDeps,
fixup-yarn-lock,
Expand Down Expand Up @@ -60,40 +59,7 @@ in

src = null;

patches =
base.patches
++ lib.optionals (lib.versionOlder info.version "32") [
# Backport a few fixes for -Wmissing-template-arg-list-after-template-kw
# which only effects the soon-to-be-EOLed electron 31 (chromium M126).
# https://issues.chromium.org/issues/344680447

# https://chromium-review.googlesource.com/c/chromium/src/+/5604664
(fetchpatch {
url = "https://github.com/chromium/chromium/commit/b0088fa60970412160535c367e2ff53b25b8538e.patch";
hash = "sha256-eEYO+IN1062iCqVr6eO3UZlGLN376lMXc6UQunJGpdQ=";
})

# https://android-review.googlesource.com/c/platform/external/perfetto/+/3114454
(fetchpatch {
name = "perfetto-e2f661907a717551235563389977b7468da6d45e.patch";
url = "https://android.googlesource.com/platform/external/perfetto/+/e2f661907a717551235563389977b7468da6d45e^!?format=TEXT";
decode = "base64 -d";
stripLen = 1;
extraPrefix = "third_party/perfetto/";
hash = "sha256-5zSAZZI1tR7O4Aui22T/6uyk0RpuIy7XqDD0nwlDySQ=";
})

./electron-31-perfetto-missing-template-arg-list.patch

# And a finally fix for -Winvalid-constexpr that is happening within the electron patchset.
# https://github.com/electron/electron/pull/42413/commits/394a26f94a3fbce91e15e80e8e73b9a3ec1f04d1
(fetchpatch {
url = "https://github.com/electron/electron/commit/394a26f94a3fbce91e15e80e8e73b9a3ec1f04d1.patch";
stripLen = 1;
extraPrefix = "electron/";
hash = "sha256-lllUUDm1thnC+rH8hBtPBVLRx6Pis5TPEUeQli9z1Mk=";
})
];
patches = base.patches;

unpackPhase =
''
Expand Down
16 changes: 0 additions & 16 deletions pkgs/development/tools/electron/disable-screen-ai.patch

This file was deleted.

This file was deleted.

Loading

0 comments on commit 588c506

Please sign in to comment.