pyrox.dev
Merge pull request #10738 from matthewbauer/emscripten-1.35
emscripten 1.29 -> 1.35
+3
-3
pkgs/development/compilers/emscripten-fastcomp/default.nix
+3
-3
pkgs/development/compilers/emscripten-fastcomp/default.nix
···
1
1
{ stdenv, fetchgit, python }:
2
2
3
3
let
4
-
tag = "1.29.10";
4
+
tag = "1.35.4";
5
5
in
6
6
7
7
stdenv.mkDerivation rec {
···
10
10
srcFC = fetchgit {
11
11
url = git://github.com/kripken/emscripten-fastcomp;
12
12
rev = "refs/tags/${tag}";
13
-
sha256 = "eee0f884c7e10e1b869b9d3afbb03bf69c63ec0560b136e3e8cd64ca00a41653";
13
+
sha256 = "3bd50787d78381f684f9b3f46fc91cc3d1803c3389e19ec41ee59c2deaf727d8";
14
14
};
15
15
16
16
srcFL = fetchgit {
17
17
url = git://github.com/kripken/emscripten-fastcomp-clang;
18
18
rev = "refs/tags/${tag}";
19
-
sha256 = "22c48e85dfacd9f2349d37fb421f0f848b65fc7b39e66984d04349ee3271667c";
19
+
sha256 = "ec0d22c04eec5f84695401e19a52704b28e8d2779b87388f399b5f63b54a9862";
20
20
};
21
21
22
22
buildInputs = [ python ];
+20
-17
pkgs/development/compilers/emscripten/default.nix
+20
-17
pkgs/development/compilers/emscripten/default.nix
···
1
1
{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
2
2
3
3
let
4
-
tag = "1.29.10";
4
+
tag = "1.35.4";
5
+
appdir = "share/emscripten";
5
6
in
6
7
7
8
stdenv.mkDerivation rec {
···
10
11
src = fetchgit {
11
12
url = git://github.com/kripken/emscripten;
12
13
rev = "refs/tags/${tag}";
13
-
sha256 = "0d7ed2b801ac37acaf907bd03ba42cce3ac4a4c330bf1ef28de25bbb3f39ba87";
14
+
sha256 = "466500356c8c0fbcee495b2dbd2ccf0bf9d7eaf303d274ebaf491122759dd233";
14
15
};
15
16
16
17
buildCommand = ''
17
-
mkdir $out
18
-
cp -a $src $out/bin
19
-
chmod -R +w $out/bin
20
-
grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
21
-
sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py
22
-
sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/bin/tools/shared.py
23
-
sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/bin/tools/shared.py
18
+
mkdir -p $out/${appdir}
19
+
cp -r $src/* $out/${appdir}
20
+
chmod -R +w $out/${appdir}
21
+
grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
22
+
sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py
23
+
sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py
24
+
sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py
25
+
mkdir $out/bin
26
+
ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
24
27
25
-
echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config
26
-
echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config
27
-
echo "PYTHON = '${python}/bin/python'" >> $out/config
28
-
echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config
29
-
echo "JS_ENGINES = [NODE_JS]" >> $out/config
30
-
echo "COMPILER_ENGINE = NODE_JS" >> $out/config
31
-
echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config
32
-
echo "JAVA = '${jre}/bin/java'" >> $out/config
28
+
echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
29
+
echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/${appdir}/config
30
+
echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
31
+
echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
32
+
echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
33
+
echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
34
+
echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/compiler.jar'" >> $out/${appdir}/config
35
+
echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
33
36
'';
34
37
meta = with stdenv.lib; {
35
38
homepage = https://github.com/kripken/emscripten;