@@ -1,16 +1,15 @@
|
||||
{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
|
||||
|
||||
let
|
||||
version = "0.4.23";
|
||||
rev = "124ca40dc525a987a88176c6e5170978e82fa290";
|
||||
sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0";
|
||||
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
|
||||
version = "0.4.24";
|
||||
rev = "e67f0147998a9e3835ed3ce8bf6a0a0c634216c5";
|
||||
sha256 = "1gy2miv6ia1z98zy6w4y03balwfr964bnvwzyg8v7pn2mayqnaap";
|
||||
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
|
||||
jsoncpp = fetchzip {
|
||||
url = jsoncppURL;
|
||||
sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
|
||||
sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "solc-${version}";
|
||||
|
||||
@@ -21,7 +20,6 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/boost-shared-libs.patch
|
||||
./patches/shared-libs-install.patch
|
||||
];
|
||||
|
||||
@@ -30,17 +28,23 @@ stdenv.mkDerivation {
|
||||
echo >commit_hash.txt "${rev}"
|
||||
substituteInPlace cmake/jsoncpp.cmake \
|
||||
--replace "${jsoncppURL}" ${jsoncpp}
|
||||
substituteInPlace cmake/EthCompilerSettings.cmake \
|
||||
--replace "add_compile_options(-Werror)" ""
|
||||
|
||||
# To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
|
||||
substituteInPlace cmake/jsoncpp.cmake \
|
||||
--replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
|
||||
--replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBoost_USE_STATIC_LIBS=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DINSTALL_LLLC=ON"
|
||||
"-DTESTS=OFF"
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
|
||||
"./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost z3 ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user