@@ -17,81 +17,81 @@ toNixName name = f name
1717-- possibility of name clashes with Haskell libraries. I have included
1818-- identity mappings to incicate that I have verified their correctness.
1919libNixName :: String -> [String]
20−libNixName "adns" = return "adns"
21−libNixName "alsa" = return "alsaLib"
22−libNixName "asound" = return "alsaLib"
23−libNixName "cairo-pdf" = return "cairo"
24−libNixName "cairo-ps" = return "cairo"
25−libNixName "cairo" = return "cairo"
26−libNixName "cairo-svg" = return "cairo"
27−libNixName "crypto" = return "openssl"
28−libNixName "dl" = [] -- provided by glibc
29−libNixName "gconf-2.0" = return "gconf"
30−libNixName "gdk-2.0" = return "gtk"
31−libNixName "gdk-pixbuf-2.0" = return "gdk_pixbuf"
32−libNixName "gio-2.0" = return "glib"
33−libNixName "glib-2.0" = return "glib"
34−libNixName "GL" = return "mesa"
35−libNixName "GLU" = ["freeglut","mesa"]
36−libNixName "glut" = ["freeglut","mesa"]
37−libNixName "gnome-keyring-1" = return "gnome_keyring"
38−libNixName "gnome-keyring" = return "gnome_keyring"
39−libNixName "gobject-2.0" = return "glib"
40−libNixName "gstreamer-0.10" = return "gstreamer"
20+libNixName "adns" = return "adns"
21+libNixName "alsa" = return "alsaLib"
22+libNixName "asound" = return "alsaLib"
23+libNixName "cairo-pdf" = return "cairo"
24+libNixName "cairo-ps" = return "cairo"
25+libNixName "cairo" = return "cairo"
26+libNixName "cairo-svg" = return "cairo"
27+libNixName "crypto" = return "openssl"
28+libNixName "dl" = [] -- provided by glibc
29+libNixName "gconf-2.0" = return "gconf"
30+libNixName "gdk-2.0" = return "gtk"
31+libNixName "gdk-pixbuf-2.0" = return "gdk_pixbuf"
32+libNixName "gio-2.0" = return "glib"
33+libNixName "glib-2.0" = return "glib"
34+libNixName "GL" = return "mesa"
35+libNixName "GLU" = ["freeglut","mesa"]
36+libNixName "glut" = ["freeglut","mesa"]
37+libNixName "gnome-keyring-1" = return "gnome_keyring"
38+libNixName "gnome-keyring" = return "gnome_keyring"
39+libNixName "gobject-2.0" = return "glib"
40+libNixName "gstreamer-0.10" = return "gstreamer"
4141libNixName "gstreamer-audio-0.10" = return "gstreamer-audio"
4242libNixName "gstreamer-base-0.10" = return "gstreamer-base"
4343libNixName "gstreamer-controller-0.10" = return "gstreamer-controller"
4444libNixName "gstreamer-dataprotocol-0.10" = return "gstreamer-dataprotocol"
4545libNixName "gstreamer-net-0.10" = return "gstreamer-net"
4646libNixName "gstreamer-plugins-base-0.10" = return "gstreamer-plugins-base"
47−libNixName "gthread-2.0" = return "glib"
48−libNixName "gtk+-2.0" = return "gtk"
49−libNixName "gtkglext-1.0" = return "gtkglext"
50−libNixName "gtksourceview-2.0" = return "gtksourceview"
51−libNixName "icudata" = return "icu"
52−libNixName "icui18n" = return "icu"
53−libNixName "icuuc" = return "icu"
54−libNixName "idn" = return "libidn"
55−libNixName "IL" = return "libdevil"
56−libNixName "iw" = return "wirelesstools"
57−libNixName "jpeg" = return "libjpeg"
58−libNixName "libglade-2.0" = return "libglade"
59−libNixName "libgsasl" = return "gsasl"
60−libNixName "librsvg-2.0" = return "librsvg"
61−libNixName "libusb-1.0" = return "libusb"
62−libNixName "libxml-2.0" = return "libxml2"
63−libNixName "libzip" = return "libzip"
64−libNixName "m" = [] -- in stdenv
65−libNixName "ncursesw" = return "ncurses"
66−libNixName "panelw" = return "ncurses"
67−libNixName "pangocairo" = return "pango"
68−libNixName "pcre" = return "pcre"
69−libNixName "png" = return "libpng"
70−libNixName "poppler-glib" = return "popplerGlib"
71−libNixName "pq" = return "postgresql"
72−libNixName "pthread" = []
73−libNixName "sndfile" = return "libsndfile"
74−libNixName "sqlite3" = return "sqlite"
75−libNixName "ssl" = return "openssl"
76−libNixName "stdc++" = [] -- in stdenv
77−libNixName "webkit-1.0" = return "webkit"
78−libNixName "X11" = return "libX11"
79−libNixName "Xext" = return "libXext"
80−libNixName "xft" = return "libXft"
81−libNixName "Xi" = return "libXi"
82−libNixName "xml2" = return "libxml2"
83−libNixName "Xrandr" = return "libXrandr"
84−libNixName "Xss" = return "libXScrnSaver"
85−libNixName "Xtst" = return "libXtst"
86−libNixName "zmq" = return "zeromq"
87−libNixName "libzmq" = return "zeromq"
88−libNixName "z" = return "zlib"
89−libNixName x = return x
47+libNixName "gthread-2.0" = return "glib"
48+libNixName "gtk+-2.0" = return "gtk"
49+libNixName "gtkglext-1.0" = return "gtkglext"
50+libNixName "gtksourceview-2.0" = return "gtksourceview"
51+libNixName "icudata" = return "icu"
52+libNixName "icui18n" = return "icu"
53+libNixName "icuuc" = return "icu"
54+libNixName "idn" = return "libidn"
55+libNixName "IL" = return "libdevil"
56+libNixName "iw" = return "wirelesstools"
57+libNixName "jpeg" = return "libjpeg"
58+libNixName "libglade-2.0" = return "libglade"
59+libNixName "libgsasl" = return "gsasl"
60+libNixName "librsvg-2.0" = return "librsvg"
61+libNixName "libusb-1.0" = return "libusb"
62+libNixName "libxml-2.0" = return "libxml2"
63+libNixName "libzip" = return "libzip"
64+libNixName "libzmq" = return "zeromq"
65+libNixName "m" = [] -- in stdenv
66+libNixName "ncursesw" = return "ncurses"
67+libNixName "panelw" = return "ncurses"
68+libNixName "pangocairo" = return "pango"
69+libNixName "pcre" = return "pcre"
70+libNixName "png" = return "libpng"
71+libNixName "poppler-glib" = return "popplerGlib"
72+libNixName "pq" = return "postgresql"
73+libNixName "pthread" = []
74+libNixName "sndfile" = return "libsndfile"
75+libNixName "sqlite3" = return "sqlite"
76+libNixName "ssl" = return "openssl"
77+libNixName "stdc++" = [] -- in stdenv
78+libNixName "webkit-1.0" = return "webkit"
79+libNixName "X11" = return "libX11"
80+libNixName "Xext" = return "libXext"
81+libNixName "xft" = return "libXft"
82+libNixName "Xi" = return "libXi"
83+libNixName "xml2" = return "libxml2"
84+libNixName "Xrandr" = return "libXrandr"
85+libNixName "Xss" = return "libXScrnSaver"
86+libNixName "Xtst" = return "libXtst"
87+libNixName "zmq" = return "zeromq"
88+libNixName "z" = return "zlib"
89+libNixName x = return x
9090
9191-- | Map build tool names to Nix attribute names.
9292buildToolNixName :: String -> [String]
93−buildToolNixName "cabal" = return "cabalInstall"
94−buildToolNixName "gtk2hsC2hs" = return "gtk2hsBuildtools"
95−buildToolNixName "gtk2hsHookGenerator" = return "gtk2hsBuildtools"
96−buildToolNixName "gtk2hsTypeGen" = return "gtk2hsBuildtools"
97−buildToolNixName x = return (toNixName x)
93+buildToolNixName "cabal" = return "cabalInstall"
94+buildToolNixName "gtk2hsC2hs" = return "gtk2hsBuildtools"
95+buildToolNixName "gtk2hsHookGenerator" = return "gtk2hsBuildtools"
96+buildToolNixName "gtk2hsTypeGen" = return "gtk2hsBuildtools"
97+buildToolNixName x = return (toNixName x)