3
0
Fork 0
forked from mirrors/nixpkgs

emscripten: revision bump from 1.35.4 to 1.36.4, was tested with compiling xml.js

This commit is contained in:
Joachim Schiele 2016-05-25 03:53:20 +02:00
parent 25e3c091a0
commit 4d261909b9
2 changed files with 8 additions and 8 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchgit, python }: { stdenv, fetchgit, python }:
let let
tag = "1.35.4"; tag = "1.36.4";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
srcFC = fetchgit { srcFC = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp; url = git://github.com/kripken/emscripten-fastcomp;
rev = "refs/tags/${tag}"; rev = "refs/tags/${tag}";
sha256 = "3bd50787d78381f684f9b3f46fc91cc3d1803c3389e19ec41ee59c2deaf727d8"; sha256 = "0qmrc83yrlmlb11gqixxnwychif964054lgdiycz0l10yj0q37j5";
}; };
srcFL = fetchgit { srcFL = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp-clang; url = git://github.com/kripken/emscripten-fastcomp-clang;
rev = "refs/tags/${tag}"; rev = "refs/tags/${tag}";
sha256 = "ec0d22c04eec5f84695401e19a52704b28e8d2779b87388f399b5f63b54a9862"; sha256 = "1av58y9s24l32hsdgp3jh4fkc5005xbzzjd27in2r9q3p6igd5d4";
}; };
buildInputs = [ python ]; buildInputs = [ python ];
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten-fastcomp; homepage = https://github.com/kripken/emscripten-fastcomp;
description = "emscripten llvm"; description = "emscripten llvm";
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ bosu ]; maintainers = with maintainers; [ qknight ];
license = stdenv.lib.licenses.ncsa; license = stdenv.lib.licenses.ncsa;
}; };
} }

View file

@ -1,7 +1,7 @@
{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: { stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let let
tag = "1.35.4"; tag = "1.36.4";
appdir = "share/emscripten"; appdir = "share/emscripten";
in in
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = git://github.com/kripken/emscripten; url = git://github.com/kripken/emscripten;
rev = "refs/tags/${tag}"; rev = "refs/tags/${tag}";
sha256 = "466500356c8c0fbcee495b2dbd2ccf0bf9d7eaf303d274ebaf491122759dd233"; sha256 = "02m85xh9qx29kb6v11y072gk8fvyc23964wclr70c69j2gal2qpr";
}; };
buildCommand = '' buildCommand = ''
mkdir -p $out/${appdir} mkdir -p $out/${appdir}
cp -r $src/* $out/${appdir} cp -r $src/* $out/${appdir}
chmod -R +w $out/${appdir} chmod -R +w $out/${appdir}
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten; homepage = https://github.com/kripken/emscripten;
description = "An LLVM-to-JavaScript Compiler"; description = "An LLVM-to-JavaScript Compiler";
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ bosu ]; maintainers = with maintainers; [ qknight ];
license = licenses.ncsa; license = licenses.ncsa;
}; };
} }