From 022ddc17a7bd3991cee9554ad6f3a678098108d2 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 26 Jun 2019 00:24:04 +0800
Subject: [PATCH] solc: 0.5.9 -> 0.5.10

---
 pkgs/development/compilers/solc/default.nix   | 21 ++++++++-----------
 .../solc/patches/shared-libs-install.patch    |  4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index cf59b2c1761..941f92fd322 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, ncurses, python2
+{ stdenv, fetchzip, boost, cmake, ncurses, python2
 , z3Support ? true, z3 ? null
 }:
 
@@ -6,9 +6,6 @@ assert z3Support -> z3 != null;
 assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0";
 
 let
-  version = "0.5.9";
-  rev = "c68bc34e9466ef22326dd9072d557c56160e9092";
-  sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -16,20 +13,20 @@ let
   };
   buildSharedLibs = stdenv.hostPlatform.isLinux;
 in
-stdenv.mkDerivation {
-  name = "solc-${version}";
+stdenv.mkDerivation rec {
 
-  src = fetchFromGitHub {
-    owner = "ethereum";
-    repo = "solidity";
-    inherit rev sha256;
+  name = "solc-${version}";
+  version = "0.5.10";
+
+  # upstream suggests avoid using archive generated by github
+  src = fetchzip {
+    url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
+    sha256 = "1ns562h8blvv32lz462rf5835fs2hgn698mvi6ss5y7ar6k5y5xw";
   };
 
   patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
 
   postPatch = ''
-    touch prerelease.txt
-    echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
   '';
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index e106c9bbb74..382d49599c7 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -49,8 +49,8 @@ index 0bdec4b4..e876177e 100644
 +++ b/libsolidity/CMakeLists.txt
 @@ -29,6 +29,7 @@ endif()
  
- add_library(solidity ${sources} ${headers})
- target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system)
 +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
  if (${Z3_FOUND})