Skip to content

Commit

Permalink
nodejs-18_x: fix cross compilation to aarch64-linux
Browse files Browse the repository at this point in the history
This adds a patch reverting nodejs/node#43200 because it breaks
cross compilation to aarch64-linux. Gcc would not recognize the
`-msign-return-address=all` flag causing compilation to fail.
  • Loading branch information
IvarWithoutBones committed Sep 6, 2022
1 parent 24b025c commit 71b8597
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion pkgs/development/web/nodejs/v18.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ callPackage, python3, enableNpm ? true }:
{ callPackage, fetchpatch, python3, enableNpm ? true }:

let
buildNodejs = callPackage ./nodejs.nix {
Expand All @@ -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
];
}

0 comments on commit 71b8597

Please sign in to comment.