diff options
| author | Will Cohen <willcohen@users.noreply.github.com> | 2023-01-04 22:24:16 -0500 |
|---|---|---|
| committer | Will Cohen <willcohen@users.noreply.github.com> | 2023-01-17 13:43:46 -0500 |
| commit | 275bb9b54493a116ed4ad0f7d84861a15fdbda6a (patch) | |
| tree | be8826aa8b71a6e385b6aae4f009175522870d9a | |
| parent | binaryen: 109 -> 111 (diff) | |
| download | nixpkgs-275bb9b54493a116ed4ad0f7d84861a15fdbda6a.tar.gz | |
emscripten: backport support for binaryen 111
| -rw-r--r-- | pkgs/development/compilers/emscripten/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 3daaccd7e0b3..02b1f6f03b2a 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll +, symlinkJoin, makeWrapper, substituteAll, fetchpatch , buildNpmPackage , emscripten }: @@ -44,6 +44,16 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + # https://github.com/emscripten-core/emscripten/pull/18219 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; + sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; + }) + # https://github.com/emscripten-core/emscripten/pull/18220 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; + sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + }) ]; buildPhase = '' |