git.iko.soy/typeable/cabal2nix
on master help sign in
Include all build inputs in parameters.
commit71e9acef9bcf47384bb1dfc001c7117bcf77c978 authorAndres Loeh <mail@andres-loeh.de> dateMon 8 Aug 2011, 16:50 (15 years ago) parent4abf4da
1 file changed+2−1
src/Cabal2Nix/Package.hs+2−1
src/Cabal2Nix/Package.hs+2−1
@@ -58,7 +58,7 @@ showNixPkg (Pkg name ver sha256 url desc lic isLib isExe deps
5858 doc = sep [
5959 lbrace <+> (fcat $ prepunctuate (comma <> text " ") $
6060 map (nest 2 . text)
61− ("cabal" : pkgBuildTools ++ pkgDeps)),
61+ ("cabal" : pkgInputs)),
6262 rbrace <> colon
6363 ] $$
6464 vcat [
@@ -111,6 +111,7 @@ showNixPkg (Pkg name ver sha256 url desc lic isLib isExe deps
111111 filter (`notElem` (name : corePackages)) $ map unDep deps
112112 pkgBuildTools = nub $ sort $ map toNixName $
113113 filter (`notElem` coreBuildTools) $ map unDep tools
114+ pkgInputs = nub $ pkgLibs ++ pkgPCs ++ pkgBuildTools ++ pkgDeps
114115
115116
116117cabal2nix :: GenericPackageDescription -> PkgSHA256 -> PkgPlatforms -> PkgMaintainers -> Pkg