@@ -51,16 +51,10 @@ hooks =
5151 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))
5252 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
5353 , ("gi-cairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
54− , ("gi-gdk", giGdkPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
55− , ("gi-gdkpixbuf", giGdkPixBufPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
56− , ("gi-gio", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
57− , ("gi-glib", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
58− , ("gi-gobject", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
5954 , ("gi-gst", giGstLibOverrides "gstreamer") -- https://github.com/haskell-gi/haskell-gi/issues/36
6055 , ("gi-gstaudio", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36
6156 , ("gi-gstbase", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36
6257 , ("gi-gstvideo", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36
63− , ("gi-gtk", giGtkPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6458 , ("gi-javascriptcore < 4.0.0.0", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36
6559 , ("gi-pango", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6660 , ("gi-pangocairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
@@ -262,39 +256,11 @@ stackOverrides = unlines
262256 , "'';"
263257 ]
264258
265−exportGirSearchPath :: [String] -> String
266−exportGirSearchPath packages =
267− "export HASKELL_GI_GIR_SEARCH_PATH="
268− ++ intercalate ":" [ "${" ++ package ++ "}/share/gir-1.0" | package <- packages]
269−
270−giPhaseOverrides :: Derivation -> Derivation
271−giPhaseOverrides
272− = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gobjectIntrospection.dev"] ++ "'';")
273− . set (libraryDepends . pkgconfig . contains (pkg "gobjectIntrospection")) True
274−
275−giGdkPhaseOverrides :: Derivation -> Derivation
276−giGdkPhaseOverrides
277− = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk3.dev"] ++ "'';")
278−
279−giGdkPixBufPhaseOverrides :: Derivation -> Derivation
280−giGdkPixBufPhaseOverrides
281− = set phaseOverrides (unlines
282− [ "preConfigure = ''"
283− , " " ++ exportGirSearchPath ["gobjectIntrospection.dev", "gdk_pixbuf.dev"]
284− , " export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0"
285− , "'';"
286− ])
287− . set (libraryDepends . pkgconfig . contains (pkg "gobjectIntrospection")) True
288−
289259-- Replace a binding for <package> to one to pkgs.gst_all_1.<package>
290260giGstLibOverrides :: String -> Derivation -> Derivation
291261giGstLibOverrides package
292262 = over (libraryDepends . pkgconfig) (replace (pkg (ident # package)) (binding # (ident # package, path # ["pkgs","gst_all_1", ident # package])))
293263
294−giGtkPhaseOverrides :: Derivation -> Derivation
295−giGtkPhaseOverrides
296− = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk3.dev"] ++ "'';")
297−
298264giCairoPhaseOverrides :: Derivation -> Derivation
299265giCairoPhaseOverrides = over phaseOverrides (++txt)
300266 . set (libraryDepends . pkgconfig . contains (pkg "cairo")) True