public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15738 from matthewbauer/emscripten-fix

Browse Source 
looks promising. let's see what hydra thinks about it. thanks
This commit is contained in:
Joachim Schiele 2016-05-27 12:23:09 +02:00
commit e5ac7103ff
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/compilers/emscripten-fastcomp/default.nix
View File

@ -1,22 +1,24 @@
{ stdenv, fetchgit, python }: { stdenv, fetchFromGitHub, python }:
let let
tag = "1.36.4"; rev = "1.36.4";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "emscripten-fastcomp-${tag}"; name = "emscripten-fastcomp-${rev}";
srcFC = fetchgit { srcFC = fetchFromGitHub {
url = git://github.com/kripken/emscripten-fastcomp; owner = "kripken";
rev = "refs/tags/${tag}"; repo = "emscripten-fastcomp";
sha256 = "0qmrc83yrlmlb11gqixxnwychif964054lgdiycz0l10yj0q37j5"; sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l";
inherit rev;
}; };
srcFL = fetchgit { srcFL = fetchFromGitHub {
url = git://github.com/kripken/emscripten-fastcomp-clang; owner = "kripken";
rev = "refs/tags/${tag}"; repo = "emscripten-fastcomp-clang";
sha256 = "1av58y9s24l32hsdgp3jh4fkc5005xbzzjd27in2r9q3p6igd5d4"; sha256 = "169hfabamv3jmf88flhl4scwaxdh24196gwpz3sdb26lzcns519q";
inherit rev;
}; };
buildInputs = [ python ]; buildInputs = [ python ];
@ -33,11 +35,12 @@ stdenv.mkDerivation rec {
make make
cp -a Release/bin $out cp -a Release/bin $out
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
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; [ qknight ]; maintainers = with maintainers; [ qknight matthewbauer ];
license = stdenv.lib.licenses.ncsa; license = stdenv.lib.licenses.ncsa;
}; };
} }

22
pkgs/development/compilers/emscripten/default.nix
View File

@ -1,20 +1,21 @@
{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let let
tag = "1.36.4"; rev = "1.36.4";
appdir = "share/emscripten"; appdir = "share/emscripten";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "emscripten-${tag}"; name = "emscripten-${rev}";
src = fetchgit { src = fetchFromGitHub {
url = git://github.com/kripken/emscripten; owner = "kripken";
rev = "refs/tags/${tag}"; repo = "emscripten";
sha256 = "02m85xh9qx29kb6v11y072gk8fvyc23964wclr70c69j2gal2qpr"; sha256 = "1c9592i891z1v9rp4a4lnsp14nwiqfxnh37g6xwwjd1bqx7x4hn7";
inherit rev;
}; };
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}
@ -34,11 +35,12 @@ stdenv.mkDerivation rec {
echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/compiler.jar'" >> $out/${appdir}/config echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/compiler.jar'" >> $out/${appdir}/config
echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
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; [ qknight ]; maintainers = with maintainers; [ qknight matthewbauer ];
license = licenses.ncsa; license = licenses.ncsa;
}; };
} }