From 5c5ff10f43995a7870755805a81bb28f1e5aec38 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Jul 2020 13:48:52 -0700 Subject: bitcoin-abc: 0.21.5 -> 0.21.10 --- pkgs/applications/blockchains/bitcoin-abc.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/blockchains') diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index aee73cecdfc71..95adfd8001209 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,30 +1,36 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent -, withGui }: +, withGui, python3, jemalloc, zeromq4 }: with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.5"; + version = "0.21.10"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; + sha256 = "1m210g6db8f09m66v75ia1fdd1dlvs1srgk2jhd3wqbvnmjqa77f"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db53 boost zlib + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" ]; + cmakeFlags = optionals (!withGui) [ + "-DBUILD_BITCOIN_QT=OFF" + ]; + + # many of the generated scripts lack execute permissions + postConfigure = '' + find ./. -type f -iname "*.sh" -exec chmod +x {} \; + ''; enableParallelBuilding = true; -- cgit 1.4.1