git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #234 from k0ral/master

Override GIR search path for gi-javascriptcore

commitb156b948adab23fda3701d76dedd26beddd92589 authorPeter Simons <simons@cryp.to> dateThu 14 Jul 2016, 11:17 (10 years ago) parent0bc3d6dd0969f0
1 file changed+11−5
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+11−5
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+11−5
@@ -49,11 +49,12 @@ hooks =
4949 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
5050 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))
5151 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
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
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
56− , ("gi-pango", 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
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
56+ , ("gi-javascriptcore", giJavascriptCorePhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
57+ , ("gi-pango", giPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
5758 , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
5859 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
5960 , ("git-annex", gitAnnexHook)
@@ -249,6 +250,11 @@ giPhaseOverrides
249250 = set phaseOverrides "preConfigure = \"export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0\";"
250251 . set (libraryDepends . pkgconfig . contains (pkg "gobjectIntrospection")) True
251252
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
257+
252258{-
253259postProcess' :: Derivation -> Derivation
254260postProcess' deriv@(MkDerivation {..})