From 43612e8e1abc4ea473b5e10efc10500c865d99e3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Aug 2020 12:29:48 +0200 Subject: [PATCH] eva: fix build Since b52808f1ad485da9e6202ed840140e434ede3c00 `cargo` respects the `$NIX_BUILD_CORES` variable by utilizing `--test-threads`. However, the `eva` package also parsed the arguments during the test-phase which caused a failure since `--test-threads` isn't expected by eva's argparser[1]. Ths fix is in a pending PR[2] that can be applied on top to fix the build. [1] https://hydra.nixos.org/build/126069084 [2] https://github.com/NerdyPepper/eva/pull/37 --- pkgs/tools/misc/eva/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 06b7b0a5200f..e59c2387a3ce 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) + + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; + sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; + }) ]; meta = with stdenv.lib; {