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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90cccd1fb9b5..4f532806ea28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,7 +1582,10 @@ with pkgs; }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; - admin-fe = callPackage ../servers/akkoma/admin-fe { }; + admin-fe = callPackage ../servers/akkoma/admin-fe { + nodejs = nodejs_18; + yarn = yarn.override { nodejs = nodejs_18; }; + }; }; akkoma-emoji = recurseIntoAttrs { blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };