diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-12-10 21:28:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 11:28:09 +0900 |
| commit | f5fdf72a246b84abda6f199606dadd50a0f04655 (patch) | |
| tree | aa53d9125d7c04ded5793c67bc36acc853107b36 /pkgs/development/web/nodejs | |
| parent | ccedff34f9e0a152c76e4c05fab07d83e0f57305 (diff) | |
| download | nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar.gz nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar.bz2 nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar.lz nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar.xz nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.tar.zst nixlib-f5fdf72a246b84abda6f199606dadd50a0f04655.zip | |
nodejs-16_x: fix build on darwin (#150037)
Diffstat (limited to 'pkgs/development/web/nodejs')
| -rw-r--r-- | pkgs/development/web/nodejs/v16.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 6eff31e3b02a..a0c978169ae1 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -10,5 +10,13 @@ in inherit enableNpm; version = "16.13.1"; sha256 = "1bb3rjb2xxwn6f4grjsa7m1pycp0ad7y6vz7v2d7kbsysx7h08sc"; - 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="; + }) + ]; } |