diff options
| -rw-r--r-- | pkgs/applications/blockchains/bitcoin-abc.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 95dab9f18b9..b03acfbf78a 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1a65pykdjkiic67fcs8cg2qrvzzrqifa93r1bzza3gdyfdvgv3ww"; + sha256 = "1d17ry9906zmwj2n3mh77b6rqmdg0dgm7b7ybh8d7q2ml0196ilj"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f749d3b8cb4..f3771917630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22337,7 +22337,11 @@ in clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { + boost = boost165; + mkDerivation = stdenv.mkDerivation; + withGui = false; + }; bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; |