From 0299641c91f55a9d1687a4e1e6e9c6759187caeb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 25 Jun 2018 15:03:59 -0400 Subject: [PATCH] haskell generic-builder: Make test and benchmark tool depends `nativeBuildInputs` This was reverted in 6e07a3a19a56b27446fb78b3213ea1d6534d1c99 with the other commits in the PR, as the number of overrides added in that PR was deemed excessive. But this commit adds no overrides, and is valuable on its own, so I am adding it back. (cherry picked from commit 359e0ce4bb084a07a39fa369a0121a2f997548a3) --- pkgs/development/haskell-modules/generic-builder.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 9ac88dca83e..d1304c79694 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -182,12 +182,14 @@ let depsBuildBuild = [ nativeGhc ]; nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ - buildTools ++ libraryToolDepends ++ executableToolDepends; + buildTools ++ libraryToolDepends ++ executableToolDepends ++ + optionals doCheck testToolDepends ++ + optionals doBenchmark benchmarkToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ allPkgconfigDepends ++ - optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++ - optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends); + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++ + optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;