git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #149556 from bobrik/ivan/nodejs-macos-fix

nodejs-17_x: fix darwin build by backporting an upstream patch

commitdc91ac86c1e290cac682633d25f067646b1a9692 authorMario Rodas <marsam@users.noreply.github.com> dateFri 10 Dec 2021, 02:10 (5 years ago) parent47f45c815117c7
1 file changed+10−2
pkgs/development/web/nodejs/v17.nix+10−2
pkgs/development/web/nodejs/v17.nix+10−2
@@ -1,4 +1,4 @@
1−{ callPackage, python3, enableNpm ? true }:
1+{ callPackage, fetchpatch, python3, enableNpm ? true }:
22
33let
44 buildNodejs = callPackage ./nodejs.nix {
@@ -9,5 +9,13 @@ buildNodejs {
99 inherit enableNpm;
1010 version = "17.1.0";
1111 sha256 = "1iyazwpgv3pxqh7zz3s87qwrbahifrj9sj1a2vwhkc4jxcvkz03b";
12− patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
12+ patches = [
13+ ./disable-darwin-v8-system-instrumentation.patch
14+ # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.
15+ # https://github.com/nodejs/node/pull/40965
16+ (fetchpatch {
17+ url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch";
18+ sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I=";
19+ })
20+ ];
1321}