Merge pull request #189938 from IvarWithoutBones/node-cross

nodejs-18_x: fix cross compilation to aarch64-linux
NixOS · Sep 8, 2022 · 9cb1994 · 9cb1994
2 parents 773feb6 + 71b8597
commit 9cb1994
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
@@ -1,4 +1,4 @@
-{ callPackage, python3, enableNpm ? true }:
+{ callPackage, fetchpatch, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -10,6 +10,14 @@ buildNodejs {
   version = "18.8.0";
   sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk=";
   patches = [
+    (fetchpatch {
+      # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200
+      name = "revert-arm64-pointer-auth.patch";
+      url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch";
+      sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY=";
+      revert = true;
+    })
+
     ./disable-darwin-v8-system-instrumentation.patch
   ];
 }