git.iko.soy/typeable/cabal2nix
on master help sign in
gi-{cairo,pango,pangocairo}: simplify cairo overrides

As with the other packages, mucking with `gobjectIntrospection` is now unnecessary for `gi-cairo`, so simplify `giCairoPhaseOverrides`. Then note that `gi-pangocairo` doesn't actually need anything more complicated than what `giCairoPhaseOverrides`, so remove its custom overrides in favor of that.

commitf433d28fd7f957449c4ee62a7ba2080929cdef96 authorMichael Alan Dorman <mdorman@ironicdesign.com> dateSat 11 Mar 2017, 16:57 (10 years ago) parentddc9ac2
1 file changed+2−18
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−18
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−18
@@ -63,7 +63,7 @@ hooks =
6363 , ("gi-gtk", giGtkPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6464 , ("gi-javascriptcore < 4.0.0.0", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36
6565 , ("gi-pango", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
66− , ("gi-pangocairo", giPangoCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
66+ , ("gi-pangocairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6767 , ("gi-webkit", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36
6868 , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
6969 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
@@ -296,9 +296,8 @@ giGtkPhaseOverrides
296296 = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk3.dev"] ++ "'';")
297297
298298giCairoPhaseOverrides :: Derivation -> Derivation
299−giCairoPhaseOverrides = over phaseOverrides (++'\n':txt)
299+giCairoPhaseOverrides = over phaseOverrides (++txt)
300300 . set (libraryDepends . pkgconfig . contains (pkg "cairo")) True
301− . giPhaseOverrides
302301 where
303302 txt = unlines [ "preCompileBuildDriver = ''"
304303 , " PKG_CONFIG_PATH+=\":${cairo}/lib/pkgconfig\""
@@ -306,21 +305,6 @@ giCairoPhaseOverrides = over phaseOverrides (++'\n':txt)
306305 , "'';"
307306 ]
308307
309−giPangoCairoPhaseOverrides :: Derivation -> Derivation
310−giPangoCairoPhaseOverrides = set phaseOverrides txt
311− . over (libraryDepends . pkgconfig) addPkgs
312− where
313− addPkgs = Set.union (Set.fromList [ "system-pango = pkgs.pango"
314− , "system-cairo = pkgs.cairo" ])
315− . Set.insert (pkg "gobjectIntrospection")
316− gir = [ "system-pango.dev" ]
317− txt = unlines [ "preConfigure = ''" ++ exportGirSearchPath gir ++ "'';"
318− , "preCompileBuildDriver = ''"
319− , " PKG_CONFIG_PATH+=\":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig\""
320− , " setupCompileFlags+=\" $(pkg-config --libs pangocairo cairo-gobject)\""
321− , "'';"
322− ]
323−
324308hfseventsOverrides :: Derivation -> Derivation
325309hfseventsOverrides
326310 = set isLibrary True