From 8199f6b551b5a9dfda627ee15887c3a25bd40fed Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 7 Jul 2025 01:25:46 +0000
Subject: [PATCH] treewide: replace node platform mapping with
 stdenv.hostPlatform.node.{arch,platform}

---
 pkgs/build-support/node/build-npm-package/default.nix |  9 ++-------
 pkgs/by-name/af/affine-bin/package.nix                | 10 ++--------
 pkgs/by-name/af/affine/package.nix                    | 10 ++--------
 pkgs/by-name/el/element-desktop/keytar/default.nix    | 11 +----------
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 69181aee399c..fb57c0cfd0b9 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -104,13 +104,8 @@ lib.extendMkDerivation {
       dontStrip = args.dontStrip or true;
 
       env = {
-        npm_config_arch =
-          {
-            "x86_64" = "x64";
-            "aarch64" = "arm64";
-          }
-          .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
-        npm_config_platform = stdenv.hostPlatform.parsed.kernel.name;
+        npm_config_arch = stdenv.hostPlatform.node.arch;
+        npm_config_platform = stdenv.hostPlatform.node.platform;
       } // (args.env or { });
 
       meta = (args.meta or { }) // {
diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index b576208ee505..65e73398f3d9 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -13,14 +13,8 @@
 }:
 let
   hostPlatform = stdenvNoCC.hostPlatform;
-  nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform`
-  nodeArch = # nodejs's `process.arch`
-    {
-      "x86_64" = "x64";
-      "aarch64" = "arm64";
-    }
-    .${hostPlatform.parsed.cpu.name}
-      or (throw "affine-bin(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
+  nodePlatform = hostPlatform.node.platform;
+  nodeArch = hostPlatform.node.arch;
 in
 stdenvNoCC.mkDerivation (
   finalAttrs:
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 51045670eb1f..13ddac4f899c 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -26,14 +26,8 @@
 }:
 let
   hostPlatform = stdenvNoCC.hostPlatform;
-  nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform`
-  nodeArch = # nodejs's `process.arch`
-    {
-      "x86_64" = "x64";
-      "aarch64" = "arm64";
-    }
-    .${hostPlatform.parsed.cpu.name}
-      or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
+  nodePlatform = hostPlatform.node.platform;
+  nodeArch = hostPlatform.node.arch;
   electron = electron_35;
   nodejs = nodejs_22;
   yarn-berry = yarn-berry_4.override { inherit nodejs; };
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index 56a49eef1459..2c2fdf78aa1e 100644
--- a/pkgs/by-name/el/element-desktop/keytar/default.nix
+++ b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -52,16 +52,7 @@ stdenv.mkDerivation rec {
     # Make sure the native modules are built against electron's ABI
     "--nodedir=${electron.headers}"
     # https://nodejs.org/api/os.html#osarch
-    "--arch=${
-      if stdenv.hostPlatform.parsed.cpu.name == "i686" then
-        "ia32"
-      else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then
-        "x64"
-      else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then
-        "arm64"
-      else
-        stdenv.hostPlatform.parsed.cpu.name
-    }"
+    "--arch=${stdenv.hostPlatform.node.arch}"
   ];
 
   installPhase = ''