@@ -21,7 +21,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
2121 , isLibrary = isJust (Cabal.library tpkg)
2222 , isExecutable = not (null (Cabal.executables tpkg))
2323 , buildDepends = map unDep deps
24− , testDepends = map unDep (concatMap Cabal.targetBuildDepends tstDeps)
24+ , testDepends = map unDep tstDeps ++ concatMap Cabal.extraLibs tests
2525 , buildTools = map unDep tools
2626 , extraLibs = libs
2727 , pkgConfDeps = pcs
@@ -43,12 +43,14 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
4343 descr = Cabal.packageDescription cabal
4444 pkg = Cabal.package descr
4545 deps = Cabal.buildDepends tpkg
46+ tests = map Cabal.testBuildInfo (Cabal.testSuites tpkg)
4647 libDeps = map Cabal.libBuildInfo (maybeToList (Cabal.library tpkg))
4748 exeDeps = map Cabal.buildInfo (Cabal.executables tpkg)
48− tstDeps = map Cabal.testBuildInfo (Cabal.testSuites tpkg)
49− tools = concatMap Cabal.buildTools (libDeps ++ exeDeps ++ tstDeps)
50− libs = concatMap Cabal.extraLibs (libDeps ++ exeDeps ++ tstDeps)
51− pcs = map unDep (concatMap Cabal.pkgconfigDepends (libDeps ++ exeDeps ++ tstDeps))
49+ tstDeps = concatMap Cabal.buildTools tests ++ concatMap Cabal.pkgconfigDepends tests ++
50+ concatMap Cabal.targetBuildDepends tests
51+ tools = concatMap Cabal.buildTools (libDeps ++ exeDeps)
52+ libs = concatMap Cabal.extraLibs (libDeps ++ exeDeps)
53+ pcs = map unDep (concatMap Cabal.pkgconfigDepends (libDeps ++ exeDeps))
5254 Right (tpkg, _) = finalizePackageDescription
5355 (configureCabalFlags pkg)
5456 (const True)