diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-12-11 14:09:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-12-11 14:09:04 +0100 |
| commit | 48b286bd263bdd6ae17e5f497b90fb67cbb1b72b (patch) | |
| tree | 1b8cf8ed9098a95681801dd7c4280b241cf386e1 /pkgs/development | |
| parent | 6ac7b9234ad8762539fd492b295ec7b1d847570f (diff) | |
| parent | 3b235f07359a2fe5bf2bf005ede25ecab8f19f87 (diff) | |
| download | nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar.gz nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar.bz2 nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar.lz nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar.xz nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.tar.zst nixlib-48b286bd263bdd6ae17e5f497b90fb67cbb1b72b.zip | |
Merge #273521: node 20 fixes
...into staging-next
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/binaryen/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index dcadf054bc30..bb933eac9af0 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, +{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten, gtest, lit, nodejs, filecheck }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; + # Fix build with Node 20 + # FIXME: remove for next release + patches = [ + (fetchpatch { + url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch"; + hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY="; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; preConfigure = '' |