b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

emscripten: backport support for binaryen 111

Browse source
This commit is contained in:
Will Cohen 2023-01-04 22:24:16 -05:00
parent 875a3567e0
commit 275bb9b544
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/emscripten/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
, jre, binaryen , jre, binaryen
, llvmPackages , llvmPackages
, symlinkJoin, makeWrapper, substituteAll , symlinkJoin, makeWrapper, substituteAll, fetchpatch
, buildNpmPackage , buildNpmPackage
, emscripten , emscripten
}: }:
@ -44,6 +44,16 @@ stdenv.mkDerivation rec {
src = ./0001-emulate-clang-sysroot-include-logic.patch; src = ./0001-emulate-clang-sysroot-include-logic.patch;
resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; 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 = '' buildPhase = ''