git.iko.soy/typeable/cabal2nix
on master help sign in
Correct some obsolete name mappings.

Suggested in https://github.com/NixOS/nixpkgs/pull/43872.

commita1690c5dfc539dbd8ad2eb8e7474de342144a87b authorPeter Simons <simons@cryp.to> dateSat 21 Jul 2018, 16:50 (8 years ago) parent01bd5bc
1 file changed+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−2
@@ -38,7 +38,7 @@ libNixName "cairo-svg" = return "cairo"
3838libNixName "crypt" = [] -- provided by glibc
3939libNixName "crypto" = return "openssl"
4040libNixName "curses" = return "ncurses"
41−libNixName "dbusmenu-glib-0.4" = return "libdbusmenu-glib"
41+libNixName "dbusmenu-glib-0.4" = return "libdbusmenu"
4242libNixName "dbusmenu-gtk3-0.4" = ["libdbusmenu-gtk3", "gtk3"]
4343libNixName "dl" = [] -- provided by glibc
4444libNixName "fftw3" = return "fftw"
@@ -129,7 +129,6 @@ libNixName "Qt5Widgets" = return "qt5"
129129libNixName "rt" = [] -- in glibc
130130libNixName "rtlsdr" = return "rtl-sdr"
131131libNixName "ruby1.8" = return "ruby"
132−libNixName "sane-backends" = return "saneBackends"
133132libNixName "sass" = return "libsass"
134133libNixName "sctp" = return "lksctp-tools" -- This is linux-specific, we should create a common attribute if we ever add sctp support for other systems.
135134libNixName "sdl2" = return "SDL2"
@@ -154,6 +153,7 @@ libNixName "webkit2gtk-4.0" = return "webkitgtk" -- This
154153libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
155154libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
156155libNixName "X11" = return "libX11"
156+libNixName "x11" = return "xlibsWrapper"
157157libNixName "xau" = return "libXau"
158158libNixName "Xcursor" = return "libXcursor"
159159libNixName "xerces-c" = return "xercesc"