From 1b709c981cdee170167ca46bf694da55d0672a70 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 5 Sep 2017 15:24:04 +0800
Subject: [PATCH] go-ethereum: 1.6.6 -> 1.6.7

---
 pkgs/applications/altcoins/go-ethereum.nix | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index ce58984c8b8..1911f4081b1 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,20 +1,28 @@
-{ stdenv, lib, clang, buildGoPackage, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.6.6";
-  rev = "refs/tags/v${version}";
+  version = "1.6.7";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
-  buildInputs = [ clang ];
-  preBuild = "export CC=clang";
+  # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+  hardeningDisable = [ "fortify" ];
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://${goPackagePath}";
-    sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a";
+  src = fetchFromGitHub {
+    owner = "ethereum";
+    repo = "go-ethereum";
+    rev = "v${version}";
+    sha256 = "19cq0pmif4y33v34jzvam4mcszl8vf2saf2gzfz01l4x1iv4hf1r";
   };
 
+  # Fix cyclic referencing on Darwin
+  postInstall = stdenv.lib.optionalString (stdenv.isDarwin) ''
+    for file in $bin/bin/*; do
+      # Not all files are referencing $out/lib so consider this step non-critical
+      install_name_tool -delete_rpath $out/lib $file || true
+    done
+  '';
+
   meta = {
     homepage = https://ethereum.github.io/go-ethereum/;
     description = "Official golang implementation of the Ethereum protocol";