Fix logic for detecting cabal-doctest

hamishmack · hamishmack · commit 5b12bd8a91da · 2024-09-04T17:32:16.000+12:00
diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix
@@ -28,7 +28,7 @@ let self =
     # (not just the one we are building).
     # Enable for tests in packages that use cabal-doctest.
     ( haskellLib.isTest componentId &&
-      lib.any (x: x.identifier.name or "" == "cabal-doctest") setup.config.depends
+      lib.any (x: x.identifier.name or "" == "cabal-doctest") (package.setup-depends ++ setup.config.depends)
     )
 , allComponent # Used when `configureAllComponents` is set to get a suitable configuration.
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ let self =`
`28`	`28`	`# (not just the one we are building).`
`29`	`29`	`# Enable for tests in packages that use cabal-doctest.`
`30`	`30`	`( haskellLib.isTest componentId &&`
`31`		`- lib.any (x: x.identifier.name or "" == "cabal-doctest") setup.config.depends`
	`31`	`+ lib.any (x: x.identifier.name or "" == "cabal-doctest") (package.setup-depends ++ setup.config.depends)`
`32`	`32`	`)`
`33`	`33`	, allComponent # Used when `configureAllComponents` is set to get a suitable configuration.
`34`	`34`