diff options
author | Troels Henriksen <athas@sigkill.dk> | 2021-07-20 09:45:04 +0200 |
---|---|---|
committer | Troels Henriksen <athas@sigkill.dk> | 2021-07-20 09:59:13 +0200 |
commit | a9d3d2f349ae01c46f9e506502b494f0ee2caa98 (patch) | |
tree | 86031ea4f8ed1c7bcb6208752bd60daecdc5c188 /pkgs/development/compilers/emscripten/default.nix | |
parent | 15f88843905ba344fac89cac17f9d9e5fda63731 (diff) |
emscripten: 2.0.1 -> 2.0.10
binaryen: 96 -> 99 These updates must be in the same commit because emscripten depends on a specific version of binaryen.
Diffstat (limited to 'pkgs/development/compilers/emscripten/default.nix')
-rw-r--r-- | pkgs/development/compilers/emscripten/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 648ec156abeac..a142008e2e30a 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.1"; + version = "2.0.10"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk"; + sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk"; rev = version; }; @@ -43,10 +43,14 @@ stdenv.mkDerivation rec { sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py sed -i "/^def check_sanity/a\\ return" tools/shared.py + # super ugly: monkeypatch to add sysroot/include to the include + # path because they are otherwise not part of Nix's clang. + sed -i "490a\\ '/include'," tools/shared.py + # required for wasm2c ln -s ${nodeModules}/node_modules . - echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten + echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten echo "JS_ENGINES = [NODE_JS]" >> .emscripten @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { chmod -R +w $appdir mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ |