colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs_20: remove upstreamed patch

Browse Source
This commit is contained in:
Ivan Trubach 2023-08-28 12:20:57 +03:00
parent 65ff987f80
commit 2c88411556
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/web/nodejs/cross-patches.nix
View File

@ -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=";
})
]

13
pkgs/development/web/nodejs/v18.nix
View File

@ -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=";
})
];
}

4
pkgs/development/web/nodejs/v20.nix
View File

@ -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;
];
}