about summary refs log tree commit diff
path: root/pkgs/development/web/nodejs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2021-12-10 02:10:34 -0500
committerGitHub <noreply@github.com>2021-12-10 02:10:34 -0500
commitdc91ac86c1e290cac682633d25f067646b1a9692 (patch)
treef82316a1aabe8d1bc08c2deaa393b390c9d44705 /pkgs/development/web/nodejs
parent47f45c8440e2ef1e967aa5aec3528dd976c4a488 (diff)
parent15117c71e5b72cab46b33e911e9d7da7423aefaa (diff)
downloadnixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar.gz
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar.bz2
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar.lz
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar.xz
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.tar.zst
nixlib-dc91ac86c1e290cac682633d25f067646b1a9692.zip
Merge pull request #149556 from bobrik/ivan/nodejs-macos-fix
nodejs-17_x: fix darwin build by backporting an upstream patch
Diffstat (limited to 'pkgs/development/web/nodejs')
-rw-r--r--pkgs/development/web/nodejs/v17.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix
index d1254ed48a29..ea04844662a3 100644
--- a/pkgs/development/web/nodejs/v17.nix
+++ b/pkgs/development/web/nodejs/v17.nix
@@ -1,4 +1,4 @@
-{ callPackage, python3, enableNpm ? true }:
+{ callPackage, fetchpatch, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -9,5 +9,13 @@ buildNodejs {
   inherit enableNpm;
   version = "17.1.0";
   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=";
+    })
+  ];
 }