@@ -81,6 +81,8 @@ libNixName "ImageMagick" = return "imagemagick"
81libNixName "Imlib2" = return "imlib2"
81libNixName "Imlib2" = return "imlib2"
82libNixName "iw" = return "wirelesstools"
82libNixName "iw" = return "wirelesstools"
83libNixName "jack" = return "libjack2"
83libNixName "jack" = return "libjack2"
84+libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.
85+libNixName "javascriptcoregtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.
84libNixName "jpeg" = return "libjpeg"
86libNixName "jpeg" = return "libjpeg"
85libNixName "jvm" = return "jdk"
87libNixName "jvm" = return "jdk"
86libNixName "lapack" = return "liblapack"
88libNixName "lapack" = return "liblapack"
@@ -135,22 +137,17 @@ libNixName "ssl" = return "openssl"
135libNixName "stdc++" = [] -- What is that?
137libNixName "stdc++" = [] -- What is that?
136libNixName "stdc++.dll" = [] -- What is that?
138libNixName "stdc++.dll" = [] -- What is that?
137libNixName "systemd-journal" = return "systemd"
139libNixName "systemd-journal" = return "systemd"
138−libNixName "taglib_c" = return "taglib"
139libNixName "tag_c" = return "taglib"
140libNixName "tag_c" = return "taglib"
141+libNixName "taglib_c" = return "taglib"
140libNixName "udev" = return "systemd";
142libNixName "udev" = return "systemd";
141libNixName "uuid" = return "libossp_uuid";
143libNixName "uuid" = return "libossp_uuid";
142libNixName "wayland-client" = return "wayland"
144libNixName "wayland-client" = return "wayland"
143libNixName "wayland-cursor" = return "wayland"
145libNixName "wayland-cursor" = return "wayland"
144libNixName "wayland-egl" = return "mesa"
146libNixName "wayland-egl" = return "mesa"
145libNixName "wayland-server" = return "wayland"
147libNixName "wayland-server" = return "wayland"
146−-- These are the old APIs, of which 2.4 is the last provider, so map directly to that
147−libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3"
148−libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3"
149−-- This is the current API, so let it reference an alias for the latest version
148+libNixName "webkit2gtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.
150−libNixName "javascriptcoregtk-4.0" = return "webkitgtk"
151−libNixName "webkit2gtk-4.0" = return "webkitgtk"
152−-- This package doesn't actually exist in nixpkgs at present
149+libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
153−libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension"
150+libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
154libNixName "X11" = return "libX11"
151libNixName "X11" = return "libX11"
155libNixName "xau" = return "libXau"
152libNixName "xau" = return "libXau"
156libNixName "Xcursor" = return "libXcursor"
153libNixName "Xcursor" = return "libXcursor"