pyrox.dev / nixpkgs
lol
fork atom

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)

John Ericson 0299641c cf72af3d

options
unified split
Changed files
+5 -3
pkgs
development
haskell-modules
generic-builder.nix
+5 -3
pkgs/development/haskell-modules/generic-builder.nix 
···

       
182

       
182

       
 

       
  depsBuildBuild = [ nativeGhc ];


     

       
183

       
183

       
 

       
  nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++


     

       
184

       
184

       
 

       
                      setupHaskellDepends ++


     

       
185

       

       
-

       
                      buildTools ++ libraryToolDepends ++ executableToolDepends;


     

       

       
185

       
+

       
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++


     

       

       
186

       
+

       
                      optionals doCheck testToolDepends ++


     

       

       
187

       
+

       
                      optionals doBenchmark benchmarkToolDepends;


     

       
186

       
188

       
 

       
  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;


     

       
187

       
189

       
 

       
  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++


     

       
188

       
190

       
 

       
                     allPkgconfigDepends ++


     

       
189

       

       
-

       
                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++


     

       
190

       

       
-

       
                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends);


     

       

       
191

       
+

       
                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++


     

       

       
192

       
+

       
                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);


     

       
191

       
193

       
 

       



     

       
192

       
194

       
 

       
  allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;


     

       
193

       
195