From 233dad81ebc164520fb763cbb47a16c88655888d Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Sat, 27 Oct 2018 23:50:40 +0200 Subject: particl-core: Eabled tests and parallel build. Build now dependent on Python3 and current version of Boost --- pkgs/applications/altcoins/default.nix | 2 +- pkgs/applications/altcoins/particl/particl-core.nix | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 87f5d0be68a3..b24dbb8f90a5 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -90,5 +90,5 @@ rec { parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; - particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; + particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 3be2d296d393..d3b20ef2ea36 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -10,13 +10,14 @@ , zeromq , zlib , unixtools +, python3 }: with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.17.0.2"; + version = "0.17.0.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; @@ -24,17 +25,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ - openssl db48 boost zlib miniupnpc libevent zeromq - unixtools.hexdump - ]; + buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; configureFlags = [ "--disable-bench" - "--enable-tests=no" "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals (!doCheck) [ + "--enable-tests=no" ]; + # Always check during Hydra builds + doCheck = true; + preCheck = "patchShebangs test"; + enableParallelBuilding = true; + meta = { description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription= '' -- cgit 1.4.1