diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-12 20:31:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 20:31:25 +0100 |
| commit | 61c1313bd1a71fce3b074d9c5d1482604a75529e (patch) | |
| tree | 6931f32e2c8689c3ad84c05911d3652fc10ef6c3 /pkgs/development/compilers | |
| parent | c0d28bdf239d549ed4920dfa4e7f9087182b0687 (diff) | |
| parent | cbc54299b36e7faf5687e8c613123c7a0cc8b16f (diff) | |
| download | nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar.gz nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar.bz2 nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar.lz nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar.xz nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.tar.zst nixlib-61c1313bd1a71fce3b074d9c5d1482604a75529e.zip | |
Merge pull request #27329 from dbrock/solc
solc: 0.4.12 -> 0.4.13
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/solc/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 6ace7d96be8c..714f06d0b53f 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: let - version = "0.4.12"; - rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c"; - sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7"; + version = "0.4.13"; + rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14"; + sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -27,6 +27,9 @@ stdenv.mkDerivation { --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" + substituteInPlace cmake/EthDependencies.cmake \ + --replace 'set(Boost_USE_STATIC_LIBS ON)' \ + 'set(Boost_USE_STATIC_LIBS OFF)' ''; buildInputs = [ boost cmake ]; @@ -36,6 +39,7 @@ stdenv.mkDerivation { longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = [ stdenv.lib.maintainers.dbrock ]; inherit version; }; |