Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

emscripten: 1.37.16 -> 1.38.6, Add mupf to maintainer list #43078

Closed
wants to merge 1 commit into from
Closed

emscripten: 1.37.16 -> 1.38.6, Add mupf to maintainer list #43078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Expand Up @@ -2720,6 +2720,11 @@
github = "muflax";
name = "Stefan Dorn";
};
mupf = {
email = "mail@michael-fitzmayer.de";
github = "mupfelofen-de";
name = "Michael Fitzmayer";
};
myrl = {
email = "myrl.0xf@gmail.com";
github = "myrl";
Expand Down
29 changes: 6 additions & 23 deletions pkgs/development/compilers/emscripten/default.nix
View file
Open in desktop
@@ -1,11 +1,10 @@
{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs
, jre, binaryen, enableWasm ? true , python2Packages, cmake
{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
, jre, binaryen, enableWasm ? true
}:

let
rev = emscriptenVersion;
rev = "1.38.6";
appdir = "share/emscripten";
binaryenVersioned = binaryen.override { emscriptenRev = rev; };
in

stdenv.mkDerivation {
Expand All @@ -14,12 +13,10 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten";
sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc";
sha256 = "11r4f4vad9smkxhx4q0yz62fd39gmawdi8xgvg1afa0chawdl1cf";
inherit rev;
};

buildInputs = [ nodejs cmake python ];

buildCommand = ''
mkdir -p $out/${appdir}
cp -r $src/* $out/${appdir}
Expand All @@ -41,30 +38,16 @@ stdenv.mkDerivation {
echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
# to make the test(s) below work
echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
''
+ stdenv.lib.optionalString enableWasm ''
echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
''
+
''
echo "--------------- running test -----------------"
# quick hack to get the test working
HOME=$TMPDIR
cp $out/${appdir}/config $HOME/.emscripten
export PATH=$PATH:$out/bin

#export EMCC_DEBUG=2
${python}/bin/python $src/tests/runner.py test_hello_world
echo "--------------- /running test -----------------"
echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
'';

meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten;
description = "An LLVM-to-JavaScript Compiler";
platforms = platforms.all;
maintainers = with maintainers; [ qknight matthewbauer ];
maintainers = with maintainers; [ qknight matthewbauer mupf ];
license = licenses.ncsa;
};
}