Merge pull request #189938 from IvarWithoutBones/node-cross
nodejs-18_x: fix cross compilation to aarch64-linux
This commit is contained in:
commit
9cb1994f42
1 changed files with 9 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ callPackage, python3, enableNpm ? true }:
|
{ callPackage, fetchpatch, python3, enableNpm ? true }:
|
||||||
|
|
||||||
let
|
let
|
||||||
buildNodejs = callPackage ./nodejs.nix {
|
buildNodejs = callPackage ./nodejs.nix {
|
||||||
|
@ -10,6 +10,14 @@ buildNodejs {
|
||||||
version = "18.8.0";
|
version = "18.8.0";
|
||||||
sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk=";
|
sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk=";
|
||||||
patches = [
|
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
|
./disable-darwin-v8-system-instrumentation.patch
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue