diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 97b2001a057f9..fc3c38e5b73a4 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -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 @@ -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 = '' diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 122a3aa0bc55a..5b37ae9278fcc 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -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 = '' diff --git a/pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch b/pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch deleted file mode 100644 index d586c69b68713..0000000000000 --- a/pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch -index a8d4bc910..1d9b97e5f 100644 ---- a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch -+++ b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch -@@ -10,10 +10,10 @@ The upstream has a fix, which will be available in Chromium M135. - Backport this fix for Electron versions before that. - - diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc --index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d7b454630 100644 -+index 43a35d394ee045f78ffecfeea582300b4083091f..ae0cdf0dcda5df71df55776f0842071eaa1b87da 100644 - --- a/media/capture/content/video_capture_oracle.cc - +++ b/media/capture/content/video_capture_oracle.cc --@@ -118,8 +118,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints( -+@@ -113,8 +113,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints( - void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) { - const bool was_enabled = - (capture_size_throttling_mode_ != kThrottlingDisabled); -@@ -24,7 +24,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - capture_size_throttling_mode_ = - enabled ? kThrottlingEnabled : kThrottlingDisabled; - VLOG(1) << "Capture size auto-throttling is now " --@@ -127,19 +128,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) { -+@@ -122,19 +123,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) { - - // When not auto-throttling, have the CaptureResolutionChooser target the max - // resolution within constraints. -@@ -51,7 +51,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - } - - bool VideoCaptureOracle::ObserveEventAndDecideCapture( --@@ -172,6 +176,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture( -+@@ -167,6 +171,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture( - if (should_sample) { - event_time = content_sampler_.frame_timestamp(); - duration_of_next_frame_ = content_sampler_.sampling_period(); -@@ -67,8 +67,8 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - } - last_time_animation_was_detected_ = event_time; - } else { --@@ -198,8 +211,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture( -- NOTREACHED(); -+@@ -194,8 +207,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture( -+ break; - } - - - if (!should_sample) -@@ -78,7 +78,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - - // If the exact duration of the next frame has not been determined, estimate - // it using the difference between the current and last frame. --@@ -373,16 +387,18 @@ void VideoCaptureOracle::RecordConsumerFeedback( -+@@ -369,16 +383,18 @@ void VideoCaptureOracle::RecordConsumerFeedback( - - // resource_utilization feedback. - -@@ -99,7 +99,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - - if (capture_size_throttling_mode_ != kThrottlingActive) { - VLOG(1) << "Received consumer feedback at frame #" << frame_number --@@ -553,12 +569,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) { -+@@ -549,12 +565,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) { - const int current_area = capture_size_.GetArea(); - const int increased_area = - resolution_chooser_.FindLargerFrameSize(current_area, 1).GetArea(); -@@ -116,7 +116,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d - if (buffer_pool_utilization_.current() > 0.0) { - const int buffer_capable_area = base::saturated_cast( - current_area / buffer_pool_utilization_.current()); --@@ -593,8 +611,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) { -+@@ -589,8 +607,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) { - - // At this point, the system is currently under-utilized. Reset the start - // time if the system was not under-utilized when the last analysis was made.