diff options
| author | Faye Duxovni <duxovni@duxovni.org> | 2022-06-17 07:45:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-17 13:45:29 +0200 |
| commit | 7b1e56acf0674cfc777f47386153e6f5ba9b34a8 (patch) | |
| tree | d660c0985c61eec71ea192f8d44e7b817f241b30 /pkgs/development/compilers/emscripten/default.nix | |
| parent | 090a4593ab0a23574f59b4033a7080a785fe0e04 (diff) | |
binaryen: 102 -> 105; emscripten: 3.0.0 -> 3.1.10 (#172741)
* binaryen: 102 -> 105 * emscripten: 3.0.0 -> 3.1.10 * Backport emscripten-core/emscripten#16986 to fix emscriptenPackages.libxml2 build * Fix patch url/hash Co-authored-by: Will Cohen <willcohen@users.noreply.github.com> Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>
Diffstat (limited to 'pkgs/development/compilers/emscripten/default.nix')
| -rw-r--r-- | pkgs/development/compilers/emscripten/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index af78b56c097f3..47464e52ddbd9 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,11 +3,12 @@ , llvmPackages , symlinkJoin, makeWrapper, substituteAll , mkYarnModules +, fetchpatch }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.0.0"; + version = "3.1.10"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs="; + sha256 = "03k0pd5hna7khrnn3k3ln38h9w0vyaicfzvfqlqbxi4zz8jikrdb"; rev = version; }; @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + (fetchpatch { + # https://github.com/emscripten-core/emscripten/pull/16986 + url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch"; + sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E="; + }) ]; buildPhase = '' |