diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-19 12:43:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 12:43:52 +0000 |
| commit | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (patch) | |
| tree | 9d43a122bbf9f02687afad5b4b634bde310dbf5e /pkgs/applications/blockchains/bitcoin-abc.nix | |
| parent | 896a18112460f3b7a67576dde0142cd37d6bab50 (diff) | |
| parent | 7de82fbe61b3fd1854fc4a89a1ab4ed6fad812e3 (diff) | |
| download | nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.gz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.bz2 nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.lz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.xz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.zst nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/blockchains/bitcoin-abc.nix')
| -rw-r--r-- | pkgs/applications/blockchains/bitcoin-abc.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index a0a7f728315..446aafab8ce 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , withGui, python3, jemalloc, zeromq4 }: @@ -18,7 +18,7 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; |