git.iko.soy/typeable/cabal2nix
on master help sign in
Update mapping of webkitgtk to non-aliased version

This is in preparation of https://github.com/NixOS/nixpkgs/pull/56892 javascriptcoregtk-4.0 and webkit2gtk-web-extension-4.0 are also part of the webkitgtk package.

commitc7ccb0ac418c10c8145aa27bd68af1012a67db46 authorJan Tojnar <jtojnar@gmail.com> dateTue 5 Mar 2019, 21:33 (8 years ago) parent5012521
1 file changed+4−4
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+4−4
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+4−4
@@ -85,7 +85,7 @@ libNixName "Imlib2" = return "imlib2"
8585libNixName "iw" = return "wirelesstools"
8686libNixName "jack" = return "libjack2"
8787libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.
88−libNixName "javascriptcoregtk-4.0" = return "webkit" -- I have no clue whether this is correct or not.
88+libNixName "javascriptcoregtk-4.0" = return "webkitgtk"
8989libNixName "jpeg" = return "libjpeg"
9090libNixName "jvm" = return "jdk"
9191libNixName "lapack" = return "liblapack"
@@ -154,9 +154,9 @@ libNixName "wayland-client" = return "wayland"
154154libNixName "wayland-cursor" = return "wayland"
155155libNixName "wayland-egl" = return "libGL"
156156libNixName "wayland-server" = return "wayland"
157−libNixName "webkit2gtk" = return "webkit"
158−libNixName "webkit2gtk-4.0" = return "webkit"
159−libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
157+libNixName "webkit2gtk" = return "webkitgtk"
158+libNixName "webkit2gtk-4.0" = return "webkitgtk"
159+libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk"
160160libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
161161libNixName "X11" = return "libX11"
162162libNixName "x11" = return "xlibsWrapper"