Commit 1ab2b7d2 authored by teutat3s's avatar teutat3s Committed by Yureka
Browse files

electron_34-bin: remove fix for read out of range on aarch64 16k pages systems 

Cleanup, because electron 34.3.0 and 33.4.1 already contain the fix
upstream and have reached nixpkgs master.

https://github.com/electron/electron/releases/tag/v34.3.0
https://github.com/electron/electron/pull/45571
https://github.com/electron/electron/releases/tag/v33.4.1
https://github.com/electron/electron/pull/45602
parent 11cf45ff

pkgs/development/tools/electron/binary/generic.nix

+1 −9
Original line number Diff line number Diff line
@@ -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 = ''