git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #412 from jtojnar/webkitgtk
285dbcaPeter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+4−4
@@ -85,7 +85,7 @@ libNixName "Imlib2" = return "imlib2"
85libNixName "iw" = return "wirelesstools"
85libNixName "iw" = return "wirelesstools"
86libNixName "jack" = return "libjack2"
86libNixName "jack" = return "libjack2"
87libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.
87libNixName "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"
89libNixName "jpeg" = return "libjpeg"
89libNixName "jpeg" = return "libjpeg"
90libNixName "jvm" = return "jdk"
90libNixName "jvm" = return "jdk"
91libNixName "lapack" = return "liblapack"
91libNixName "lapack" = return "liblapack"
@@ -154,9 +154,9 @@ libNixName "wayland-client" = return "wayland"
154libNixName "wayland-cursor" = return "wayland"
154libNixName "wayland-cursor" = return "wayland"
155libNixName "wayland-egl" = return "libGL"
155libNixName "wayland-egl" = return "libGL"
156libNixName "wayland-server" = return "wayland"
156libNixName "wayland-server" = return "wayland"
157−libNixName "webkit2gtk" = return "webkit"
157+libNixName "webkit2gtk" = return "webkitgtk"
158−libNixName "webkit2gtk-4.0" = return "webkit"
158+libNixName "webkit2gtk-4.0" = return "webkitgtk"
159−libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
159+libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk"
160libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
160libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
161libNixName "X11" = return "libX11"
161libNixName "X11" = return "libX11"
162libNixName "x11" = return "xlibsWrapper"
162libNixName "x11" = return "xlibsWrapper"