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

Merge pull request #27899 from matthewbauer/emscripten-update

Browse Source 
emscripten: 1.37.13 -> 1.37.16
This commit is contained in:
Gabriel Ebner 2017-08-07 08:51:58 +02:00 committed by GitHub
commit 28ca51c7df
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python, ... }: { stdenv, fetchFromGitHub, cmake, python, ... }:
let let
rev = "1.37.13"; rev = "1.37.16";
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kripken"; owner = "kripken";
repo = "emscripten-fastcomp"; repo = "emscripten-fastcomp";
sha256 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az"; sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by";
inherit rev; inherit rev;
}; };
srcFL = fetchFromGitHub { srcFL = fetchFromGitHub {
owner = "kripken"; owner = "kripken";
repo = "emscripten-fastcomp-clang"; repo = "emscripten-fastcomp-clang";
sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw"; sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7";
inherit rev; inherit rev;
}; };

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

@ -3,7 +3,7 @@
}: }:
let let
rev = "1.37.13"; rev = "1.37.16";
appdir = "share/emscripten"; appdir = "share/emscripten";
in in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kripken"; owner = "kripken";
repo = "emscripten"; repo = "emscripten";
sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5"; sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
inherit rev; inherit rev;
}; };