From 39c2df48d510a287fba3790a0fda9bda8e82bc2c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 3 Jun 2018 21:19:54 +0000 Subject: [PATCH] freecell-solver: fix build --- pkgs/games/freecell-solver/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index a096b17b71a5..3dc9857d4552 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, cmake , perl, gmp, libtap, gperf -, perlPackages, python3Packages }: +, perlPackages, python3 }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -13,11 +13,20 @@ stdenv.mkDerivation rec{ sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake perl gmp libtap gperf - perlPackages.TemplateToolkit perlPackages.StringShellQuote - perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting - python3Packages.python python3Packages.random2 ]; + nativeBuildInputs = [ + cmake perl pkgconfig + ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [ + GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit + ]); + + buildInputs = [ + gmp libtap gperf + python3 python3.pkgs.random2 + ]; + + # "ninja t/CMakeFiles/delta-states-test.t.exe.dir/__/delta_states.c.o" fails + # to depend on the generated "is_king.h". + enableParallelBuilding = false; meta = { description = "A FreeCell automatic solver";