From 8b184ec2e14574ed97fbf0911431bd43538542be Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 23 Sep 2018 22:00:13 -0500 Subject: [PATCH 1/3] bitcoin: don't build tests that aren't used, don't build benchmarks (cherry picked from commit d51c0a87b2ebf756015784839ec9c13950c45323) --- pkgs/applications/altcoins/bitcoin.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 878cb6064e8c..fbc22935d8c0 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec{ ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + "--disable-tests" + "--disable-gui-tests" + ] ++ optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; From b322a8bd3b58b5644aae6fe0a9ab0fb1c66e996a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 23 Sep 2018 22:01:45 -0500 Subject: [PATCH 2/3] bitcoin: parallel build, please! :) (cherry picked from commit dba5534b06c7dffe97ce644b0a5790aca8527a2e) --- pkgs/applications/altcoins/bitcoin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index fbc22935d8c0..38ce46163be6 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec{ # find or load the Qt platform plugin "minimal"" doCheck = false; + enableParallelBuilding = true; + meta = { description = "Peer-to-peer electronic cash system"; longDescription= '' From 8d83441a4c37199548c00ae8abd73092c6e46bd6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Sep 2018 01:31:45 -0500 Subject: [PATCH 3/3] bitcoin: disable tests based on doCheck, per reviewer feedback Thanks! --- pkgs/applications/altcoins/bitcoin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 38ce46163be6..dc463f386582 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" + ] ++ optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" ]