From 5b5e98b1599a5b54a7a274fea62a0a0bcd8925e4 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Wed, 20 Dec 2017 17:41:31 +0100 Subject: libbitcoin: 2.11.0 -> 3.4.0 --- pkgs/tools/misc/libbitcoin/libbitcoin.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 6d0c7b4e9c95..623f34e8b615 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,24 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook -, boost, libsodium, czmqpp, secp256k1 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +, boost, secp256k1 }: let pname = "libbitcoin"; - version = "2.11.0"; + version = "3.4.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/libbitcoin/libbitcoin/archive/v${version}.tar.gz"; - sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1h6h7cxbwkdk8bzbkfvnrrdzajw1d4lr8wqs66is735bksh6gk1y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; propagatedBuildInputs = [ secp256k1 ]; + enableParallelBuilding = true; + configureFlags = [ + "--with-tests=no" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" ]; @@ -29,8 +33,7 @@ in stdenv.mkDerivation { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; - # https://wiki.unsystem.net/en/index.php/Libbitcoin/License - # AGPL with an additional clause + # AGPL with a lesser clause license = licenses.agpl3; }; } -- cgit 1.4.1