@@ -38,7 +38,7 @@ libNixName "cairo-svg" = return "cairo"
38libNixName "crypt" = [] -- provided by glibc
38libNixName "crypt" = [] -- provided by glibc
39libNixName "crypto" = return "openssl"
39libNixName "crypto" = return "openssl"
40libNixName "curses" = return "ncurses"
40libNixName "curses" = return "ncurses"
41−libNixName "dbusmenu-glib-0.4" = return "libdbusmenu-glib"
41+libNixName "dbusmenu-glib-0.4" = return "libdbusmenu"
42libNixName "dbusmenu-gtk3-0.4" = ["libdbusmenu-gtk3", "gtk3"]
42libNixName "dbusmenu-gtk3-0.4" = ["libdbusmenu-gtk3", "gtk3"]
43libNixName "dl" = [] -- provided by glibc
43libNixName "dl" = [] -- provided by glibc
44libNixName "fftw3" = return "fftw"
44libNixName "fftw3" = return "fftw"
@@ -129,7 +129,6 @@ libNixName "Qt5Widgets" = return "qt5"
129libNixName "rt" = [] -- in glibc
129libNixName "rt" = [] -- in glibc
130libNixName "rtlsdr" = return "rtl-sdr"
130libNixName "rtlsdr" = return "rtl-sdr"
131libNixName "ruby1.8" = return "ruby"
131libNixName "ruby1.8" = return "ruby"
132−libNixName "sane-backends" = return "saneBackends"
133libNixName "sass" = return "libsass"
132libNixName "sass" = return "libsass"
134libNixName "sctp" = return "lksctp-tools" -- This is linux-specific, we should create a common attribute if we ever add sctp support for other systems.
133libNixName "sctp" = return "lksctp-tools" -- This is linux-specific, we should create a common attribute if we ever add sctp support for other systems.
135libNixName "sdl2" = return "SDL2"
134libNixName "sdl2" = return "SDL2"
@@ -154,6 +153,7 @@ libNixName "webkit2gtk-4.0" = return "webkitgtk" -- This
154libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
153libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
155libNixName "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 "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
156libNixName "X11" = return "libX11"
155libNixName "X11" = return "libX11"
156+libNixName "x11" = return "xlibsWrapper"
157libNixName "xau" = return "libXau"
157libNixName "xau" = return "libXau"
158libNixName "Xcursor" = return "libXcursor"
158libNixName "Xcursor" = return "libXcursor"
159libNixName "xerces-c" = return "xercesc"
159libNixName "xerces-c" = return "xercesc"