diff options
| author | Ivan Babrou <github@ivan.computer> | 2021-12-08 00:01:39 -0800 |
|---|---|---|
| committer | Ivan Babrou <github@ivan.computer> | 2021-12-09 08:51:15 -0800 |
| commit | 15117c71e5b72cab46b33e911e9d7da7423aefaa (patch) | |
| tree | 2678c2982ec37b1436a0e0e2d5ebabd05a8e99e9 /pkgs/development/web/nodejs | |
| parent | 475a7c63594960e5725a5753889057195e9b5738 (diff) | |
| download | nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar.gz nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar.bz2 nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar.lz nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar.xz nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.tar.zst nixlib-15117c71e5b72cab46b33e911e9d7da7423aefaa.zip | |
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.nix | 12 |
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="; + }) + ]; } |