[DW-1213] Fix the x86_64-darwin build

Author: michalrus

nix/any-darwin.nix

@@ -290,8 +290,8 @@ in rec {
       url = "https://github.com/electron/electron/releases/download/v${electronVersion}/electron-v${electronVersion}-darwin-${archSuffix}.zip";
       hash =
         if archSuffix == "x64"
-        then "sha256-a/CXlNbwILuq+AandY2hJRN7PJZkb0UD64G5VB5Q4C8="
-        else "sha256-N03fBYF5SzHu6QCCgXL5IYGTwDLA5Gv/z6xq7JXCLxo=";
+        then "sha256-I/d/vecsrYMV59Nw2SnNzrVAj1UzSUJB/F3VA9itDNw="
+        else "sha256-Up0HRemSeMZvYxyB7b7yKlrYhxMyNmAC7dNxtAmFCyQ=";
     };
 
     electronChromedriver = pkgs.fetchurl {

nix/new-common.nix

@@ -31,10 +31,13 @@ rec {
   #   };
 
   nodejs = pkgs.nodejs-18_x.overrideAttrs (drv: {
-    # XXX: we don’t want `bypass-xcodebuild.diff`, rather we supply
+    # XXX: we don’t want `bypass-xcodebuild.diff` or `bypass-darwin-xcrun-node16.patch`, rather we supply
     # the pure `xcbuild` – without that, `blake2` doesn’t build,
     # cf. <https://github.com/NixOS/nixpkgs/blob/29ae6a1f3d7a8886b3772df4dc42a13817875c7d/pkgs/development/web/nodejs/bypass-xcodebuild.diff>
-    patches = [];
+    patches = pkgs.lib.filter (patch: !(
+      pkgs.lib.hasInfix "bypass-xcodebuild" patch ||
+      pkgs.lib.hasInfix "bypass-darwin-xcrun" patch
+    )) drv.patches;
   });
 
   nodePackages = pkgs.nodePackages.override { inherit nodejs; };

scripts/rebuild-native-modules.sh

@@ -17,8 +17,8 @@ find . -type f -name '*.node' -not -path '*/@swc*/*' -exec rm -vf {} ';'
 # doesn’t work reliably.
 nix run -L .#internal.mainnet.newCommon.patchElectronRebuild
 
-# XXX: Electron 24.2 requires c++17:
-sed -r 's,std=c\+\+14,std=c++17,g' -i node_modules/usb/binding.gyp
+# XXX: Electron 24.2 requires c++17, not 14 (or old 1y):
+sed -r 's,std=c\+\+(14|1y),std=c++17,g' -i node_modules/usb/binding.gyp
 
 # TODO: do we really need to run `electron-rebuild` 3×?