git.iko.soy/typeable/cabal2nix
on master help sign in
Apply nixpkgs rename: webkitgtk24x -> webkitgtk24x-gtk3

Ref: NixOS/nixpkgs#8a62a9b064ed52da5ab2fd9520cdd218ce4445cb

commit610ffdf6ea0e7b68bad2405bb2f9aad4c8510243 authorBenno Fünfstück <benno.fuenfstueck@gmail.com> dateSun 9 Jul 2017, 17:12 (9 years ago) parent32fad9b
1 file changed+2−2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
@@ -287,8 +287,8 @@ hfseventsOverrides
287287 . over (libraryDepends . haskell) (Set.union (Set.fromList (map bind ["self.base", "self.cereal", "self.mtl", "self.text", "self.bytestring"])))
288288
289289webkitgtk24xHook :: Derivation -> Derivation -- https://github.com/NixOS/cabal2nix/issues/145
290−webkitgtk24xHook = set (libraryDepends . pkgconfig . contains (pkg "webkitgtk24x")) True
291− . over (libraryDepends . pkgconfig) (Set.filter (\b -> view localName b /= "webkitgtk24x"))
290+webkitgtk24xHook = set (libraryDepends . pkgconfig . contains (pkg "webkitgtk24x-gtk3")) True
291+ . over (libraryDepends . pkgconfig) (Set.filter (\b -> view localName b /= "webkitgtk24x-gtk3"))
292292
293293opencvOverrides :: Derivation -> Derivation
294294opencvOverrides = set phaseOverrides "hardeningDisable = [ \"bindnow\" ];"