summaryrefslogtreecommitdiff
path: root/Merge/Dependencies.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Merge/Dependencies.hs')
-rw-r--r--Merge/Dependencies.hs11
1 files changed, 8 insertions, 3 deletions
diff --git a/Merge/Dependencies.hs b/Merge/Dependencies.hs
index dedf220..1f6afc9 100644
--- a/Merge/Dependencies.hs
+++ b/Merge/Dependencies.hs
@@ -69,9 +69,7 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg
test_deps :: Portage.Dependency
test_deps = Portage.mkUseDependency (True, Portage.Use "test") $
Portage.DependAllOf $
- -- remove depends present in common section
- filter (\d -> not (Portage.dep_as_broad_as d raw_haskell_deps)) $
- map PN.normalize_depend $
+ remove_raw_common $
testDependencies overlay pkg ghc_package_names merged_cabal_pkg_name
cabal_dep :: Portage.Dependency
cabal_dep = cabalDependency overlay pkg compiler_info
@@ -90,6 +88,7 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg
setup_deps :: Portage.Dependency
setup_deps = PN.normalize_depend $ Portage.DependAllOf $
+ remove_raw_common $
setupDependencies overlay pkg ghc_package_names merged_cabal_pkg_name
edeps :: EDep
@@ -127,6 +126,9 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg
]
}
add_profile = Portage.addDepUseFlag (Portage.mkQUse (Portage.Use "profile"))
+ -- remove depends present in common section
+ remove_raw_common = filter (\d -> not (Portage.dep_as_broad_as d raw_haskell_deps))
+ . map PN.normalize_depend
---------------------------------------------------------------
-- Custom-setup dependencies
@@ -364,6 +366,7 @@ buildToolsTable =
, ("gtk2hsHookGenerator", any_c_p "dev-haskell" "gtk2hs-buildtools")
, ("gtk2hsC2hs", any_c_p "dev-haskell" "gtk2hs-buildtools")
, ("hsb2hs", any_c_p "dev-haskell" "hsb2hs")
+ , ("hsx2hs", any_c_p "dev-haskell" "hsx2hs")
, ("llvm-config", any_c_p "sys-devel" "llvm")
]
@@ -403,6 +406,7 @@ pkgconfig_table :: [(String, (String, String, Portage.SlotDepend))]
pkgconfig_table =
[
("alsa", ("media-libs", "alsa-lib", Portage.AnySlot))
+ ,("atk", ("dev-libs", "atk", Portage.AnySlot))
,("gconf-2.0", ("gnome-base", "gconf", Portage.AnySlot))
,("gio-2.0", ("dev-libs", "glib", Portage.GivenSlot "2"))
@@ -427,6 +431,7 @@ pkgconfig_table =
,("webkitgtk-3.0", ("net-libs", "webkit-gtk", Portage.GivenSlot "3"))
,("cairo", ("x11-libs", "cairo", Portage.AnySlot)) -- need [svg] for dev-haskell/cairo
+ ,("cairo-gobject", ("x11-libs", "cairo", Portage.AnySlot)) -- need [glib] for dev-haskell/cairo
,("cairo-ft", ("x11-libs", "cairo", Portage.AnySlot))
,("cairo-ps", ("x11-libs", "cairo", Portage.AnySlot))
,("cairo-png", ("x11-libs", "cairo", Portage.AnySlot))