@@ -21,7 +21,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
21 , isLibrary = isJust (Cabal.library tpkg)
21 , isLibrary = isJust (Cabal.library tpkg)
22 , isExecutable = not (null (Cabal.executables tpkg))
22 , isExecutable = not (null (Cabal.executables tpkg))
23 , buildDepends = map unDep deps
23 , buildDepends = map unDep deps
24− , testDepends = map unDep (concatMap Cabal.targetBuildDepends tstDeps)
24+ , testDepends = map unDep tstDeps ++ concatMap Cabal.extraLibs tests
25 , buildTools = map unDep tools
25 , buildTools = map unDep tools
26 , extraLibs = libs
26 , extraLibs = libs
27 , pkgConfDeps = pcs
27 , pkgConfDeps = pcs
@@ -43,12 +43,14 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
43 descr = Cabal.packageDescription cabal
43 descr = Cabal.packageDescription cabal
44 pkg = Cabal.package descr
44 pkg = Cabal.package descr
45 deps = Cabal.buildDepends tpkg
45 deps = Cabal.buildDepends tpkg
46+ tests = map Cabal.testBuildInfo (Cabal.testSuites tpkg)
46 libDeps = map Cabal.libBuildInfo (maybeToList (Cabal.library tpkg))
47 libDeps = map Cabal.libBuildInfo (maybeToList (Cabal.library tpkg))
47 exeDeps = map Cabal.buildInfo (Cabal.executables tpkg)
48 exeDeps = map Cabal.buildInfo (Cabal.executables tpkg)
48− tstDeps = map Cabal.testBuildInfo (Cabal.testSuites tpkg)
49+ tstDeps = concatMap Cabal.buildTools tests ++ concatMap Cabal.pkgconfigDepends tests ++
50+ concatMap Cabal.targetBuildDepends tests
49− tools = concatMap Cabal.buildTools (libDeps ++ exeDeps ++ tstDeps)
51+ tools = concatMap Cabal.buildTools (libDeps ++ exeDeps)
50− libs = concatMap Cabal.extraLibs (libDeps ++ exeDeps ++ tstDeps)
52+ libs = concatMap Cabal.extraLibs (libDeps ++ exeDeps)
51− pcs = map unDep (concatMap Cabal.pkgconfigDepends (libDeps ++ exeDeps ++ tstDeps))
53+ pcs = map unDep (concatMap Cabal.pkgconfigDepends (libDeps ++ exeDeps))
52 Right (tpkg, _) = finalizePackageDescription
54 Right (tpkg, _) = finalizePackageDescription
53 (configureCabalFlags pkg)
55 (configureCabalFlags pkg)
54 (const True)
56 (const True)