From d078fe1e9c826a63ad078ca4d5364c967984f393 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 May 2016 19:05:07 -0500
Subject: [PATCH] Fix hash issue in emscripten.

Just use "fetchFromGitHub" because that seems to be more
reliable. Still unclear what the actual issue was but
I'm thinking this will fix it. At least, this will
put it more in line with other packages.
---
 .../compilers/emscripten-fastcomp/default.nix | 26 ++++++++++---------
 .../compilers/emscripten/default.nix          | 19 +++++++-------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index c33c3992e00..2b8761ac62d 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchgit, python }:
+{ stdenv, fetchFromGitHub, python }:
 
 let
-  tag = "1.36.4";
+  rev = "1.36.4";
 in
 
-stdenv.mkDerivation rec {
-  name = "emscripten-fastcomp-${tag}";
+stdenv.mkDerivation {
+  name = "emscripten-fastcomp-${rev}";
 
-  srcFC = fetchgit {
-    url = git://github.com/kripken/emscripten-fastcomp;
-    rev = "refs/tags/${tag}";
-    sha256 = "0qmrc83yrlmlb11gqixxnwychif964054lgdiycz0l10yj0q37j5";
+  srcFC = fetchFromGitHub {
+    owner = "kripken";
+    repo = "emscripten-fastcomp";
+    sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l";
+    inherit rev;
   };
 
-  srcFL = fetchgit {
-    url = git://github.com/kripken/emscripten-fastcomp-clang;
-    rev = "refs/tags/${tag}";
-    sha256 = "1av58y9s24l32hsdgp3jh4fkc5005xbzzjd27in2r9q3p6igd5d4";
+  srcFL = fetchFromGitHub {
+    owner = "kripken";
+    repo = "emscripten-fastcomp-clang";
+    sha256 = "169hfabamv3jmf88flhl4scwaxdh24196gwpz3sdb26lzcns519q";
+    inherit rev;
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 456443ba0dd..568e2580889 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
+{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  tag = "1.36.4";
+  rev = "1.36.4";
   appdir = "share/emscripten";
 in
 
-stdenv.mkDerivation rec {
-  name = "emscripten-${tag}";
+stdenv.mkDerivation {
+  name = "emscripten-${rev}";
 
-  src = fetchgit {
-    url = git://github.com/kripken/emscripten;
-    rev = "refs/tags/${tag}";
-    sha256 = "02m85xh9qx29kb6v11y072gk8fvyc23964wclr70c69j2gal2qpr";
+  src = fetchFromGitHub {
+    owner = "kripken";
+    repo = "emscripten";
+    sha256 = "1c9592i891z1v9rp4a4lnsp14nwiqfxnh37g6xwwjd1bqx7x4hn7";
+    inherit rev;
   };
 
-  buildCommand = '' 
+  buildCommand = ''
     mkdir -p $out/${appdir}
     cp -r $src/* $out/${appdir}
     chmod -R +w $out/${appdir}