nodejs_20: remove upstreamed patch

3 files changed, 10 insertions, 17 deletions

diff --git a/pkgs/development/web/nodejs/cross-patches.nix b/pkgs/development/web/nodejs/cross-patches.nix
deleted file mode 100644
index f6169db6f54..00000000000
--- a/pkgs/development/web/nodejs/cross-patches.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ fetchpatch }:
-[
-  # Fixes target toolchain arguments being passed to the host toolchain when
-  # cross-compiling. For example, -m64 is not available on aarch64.
-  (fetchpatch {
-    name = "common-gypi-cross.patch";
-    url = "https://github.com/nodejs/node/pull/48597.patch";
-    hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s=";
-  })
-]
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 9af08413fca..0eb1ab4ce3f 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,12 +1,10 @@
-{ callPackage, openssl, python3, enableNpm ? true }:
+{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
     inherit openssl;
     python = python3;
   };
-
-  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -18,5 +16,12 @@ buildNodejs {
     ./revert-arm64-pointer-auth.patch
     ./node-npm-build-npm-package-logic.patch
     ./trap-handler-backport.patch
-  ] ++ crossPatches;
+    # Fixes target toolchain arguments being passed to the host toolchain when
+    # cross-compiling. For example, -m64 is not available on aarch64.
+    (fetchpatch {
+      name = "common-gypi-cross.patch";
+      url = "https://github.com/nodejs/node/pull/48597.patch";
+      hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s=";
+    })
+  ];
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 83113140a8f..658240e4f1c 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -5,8 +5,6 @@ let
     inherit openssl;
     python = python3;
   };
-
-  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -17,5 +15,5 @@ buildNodejs {
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
-  ] ++ crossPatches;
+  ];
 }