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

Fixup webkitgtk package names

commit5c18fb530ced48f35549543943f8e0c8ddaf5686 authorPeter Simons <simons@cryp.to> dateWed 28 Jun 2017, 23:13 (9 years ago) parentb2cb3cb63126ed
1 file changed+2−2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−2
@@ -143,8 +143,8 @@ libNixName "wayland-cursor" = return "wayland"
143143libNixName "wayland-egl" = return "mesa"
144144libNixName "wayland-server" = return "wayland"
145145-- These are the old APIs, of which 2.4 is the last provider, so map directly to that
146−libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x"
147−libNixName "webkitgtk-3.0" = return "webkitgtk24x"
146+libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3"
147+libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3"
148148-- This is the current API, so let it reference an alias for the latest version
149149libNixName "javascriptcoregtk-4.0" = return "webkitgtk"
150150libNixName "webkit2gtk-4.0" = return "webkitgtk"