diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/blockchains/bitcoin-abc.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/blockchains/bitcoin-abc.nix')
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-abc.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 1596ed2d357..446aafab8ce 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,8 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost -, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent +{ 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 }: -with stdenv.lib; +with lib; mkDerivation rec { @@ -18,9 +18,9 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 - miniupnpc utillinux protobuf libevent ] + miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; cmakeFlags = optionals (!withGui) [ @@ -32,8 +32,6 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - enableParallelBuilding = true; - meta = { description = "Peer-to-peer electronic cash system (Cash client)"; longDescription= '' |