@@ -49,11 +49,12 @@ hooks =
49 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
49 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
50 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))
50 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))
51 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
51 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
52− , ("gi-cairo", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
52+ , ("gi-cairo", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
53− , ("gi-gio", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
53+ , ("gi-gio", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
54− , ("gi-glib", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
54+ , ("gi-glib", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
55+ , ("gi-gobject", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
55− , ("gi-gobject", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
56+ , ("gi-javascriptcore", giJavascriptCorePhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
56− , ("gi-pango", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
57+ , ("gi-pango", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
57 , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
58 , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
58 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
59 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
59 , ("git-annex", gitAnnexHook)
60 , ("git-annex", gitAnnexHook)
@@ -249,6 +250,11 @@ giPhaseOverrides
249 = set phaseOverrides "preConfigure = \"export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0\";"
250 = set phaseOverrides "preConfigure = \"export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0\";"
250 . set (libraryDepends . pkgconfig . contains (pkg "gobjectIntrospection")) True
251 . set (libraryDepends . pkgconfig . contains (pkg "gobjectIntrospection")) True
253+giJavascriptCorePhaseOverrides :: Derivation -> Derivation
254+giJavascriptCorePhaseOverrides
255+ = set phaseOverrides "preConfigure = \"export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0\";"
256+ . set (libraryDepends . pkgconfig . contains (pkg "webkitgtk")) True
253postProcess' :: Derivation -> Derivation
259postProcess' :: Derivation -> Derivation
254postProcess' deriv@(MkDerivation {..})
260postProcess' deriv@(MkDerivation {..})