From 86116722fd1d966eb4e2b10687eed8879efc6a82 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:31:06 +0100
Subject: [PATCH] Revert "electron-bin: don't wrap inside libexec"

This reverts commit aa3ba4cb2314c81f4de495a2d99fe60705311a5a.
---
 .../tools/electron/binary/generic.nix         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 42bb8ed3799f..792ad818a20c 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -157,21 +157,25 @@ let
       chmod u-x $out/libexec/electron/*.so*
     '';
 
-    # We don't want to wrap the contents of $out/libexec automatically
-    dontWrapGApps = true;
-
-    preFixup = ''
-      makeWrapper "$out/libexec/electron/electron" $out/bin/electron \
-        "''${gappsWrapperArgs[@]}" \
-        ${lib.optionalString needsAarch64PageSizeFix "--add-flags '--js-flags=--no-decommit-pooled-pages'"}
-    '';
+    # We use null here to not cause unnecessary rebuilds.
+    dontWrapGApps = if needsAarch64PageSizeFix then true else null;
+    preFixup =
+      if needsAarch64PageSizeFix then
+        ''
+          wrapProgram "$out/libexec/electron/chrome_crashpad_handler" "''${gappsWrapperArgs[@]}"
+          wrapProgram "$out/libexec/electron/chrome-sandbox" "''${gappsWrapperArgs[@]}"
+          wrapProgram "$out/libexec/electron/electron" "''${gappsWrapperArgs[@]}" \
+            --add-flags "--js-flags=--no-decommit-pooled-pages"
+        ''
+      else
+        null;
 
     postFixup = ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${electronLibPath}:$out/libexec/electron" \
-        $out/libexec/electron/electron \
-        $out/libexec/electron/chrome_crashpad_handler
+        $out/libexec/electron/.electron-wrapped \
+        $out/libexec/electron/.chrome_crashpad_handler-wrapped
 
       # patch libANGLE
       patchelf \