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

Merge pull request #149556 from bobrik/ivan/nodejs-macos-fix

Browse Source 
nodejs-17_x: fix darwin build by backporting an upstream patch
This commit is contained in:
Mario Rodas 2021-12-10 02:10:34 -05:00 committed by GitHub
commit dc91ac86c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/web/nodejs/v17.nix
View File

@ -1,4 +1,4 @@
{ callPackage, python3, enableNpm ? true }: { callPackage, fetchpatch, python3, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { buildNodejs = callPackage ./nodejs.nix {
@ -9,5 +9,13 @@ buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "17.1.0"; version = "17.1.0";
sha256 = "1iyazwpgv3pxqh7zz3s87qwrbahifrj9sj1a2vwhkc4jxcvkz03b"; sha256 = "1iyazwpgv3pxqh7zz3s87qwrbahifrj9sj1a2vwhkc4jxcvkz03b";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.
# https://github.com/nodejs/node/pull/40965
(fetchpatch {
url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch";
sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I=";
})
];
} }