@@ -16,24 +16,24 @@ toNixName name = f name
16-- possibility of name clashes with Haskell libraries. I have included
16-- possibility of name clashes with Haskell libraries. I have included
17-- identity mappings to incicate that I have verified their correctness.
17-- identity mappings to incicate that I have verified their correctness.
18libNixName :: String -> [String]
18libNixName :: String -> [String]
19−libNixName "adns" = return "adns"
19+libNixName "adns" = return "adns"
20−libNixName "cairo" = return "cairo"
21−libNixName "cairo-pdf" = return "cairo"
20+libNixName "cairo-pdf" = return "cairo"
22−libNixName "cairo-ps" = return "cairo"
21+libNixName "cairo-ps" = return "cairo"
22+libNixName "cairo" = return "cairo"
23−libNixName "cairo-svg" = return "cairo"
23+libNixName "cairo-svg" = return "cairo"
24−libNixName "crypto" = return "openssl"
24+libNixName "crypto" = return "openssl"
25−libNixName "gnome-keyring" = return "gnome_keyring"
25+libNixName "gnome-keyring-1" = return "gnome_keyring"
26−libNixName "gnome-keyring-1" = return "gnome_keyring"
26+libNixName "gnome-keyring" = return "gnome_keyring"
27−libNixName "idn" = return "idn"
27+libNixName "idn" = return "idn"
28−libNixName "libidn" = return "idn"
28+libNixName "libidn" = return "idn"
29−libNixName "libzip" = return "libzip"
29+libNixName "libzip" = return "libzip"
30−libNixName "m" = [] -- in stdenv
30+libNixName "m" = [] -- in stdenv
31−libNixName "pcre" = return "pcre"
31+libNixName "pcre" = return "pcre"
32−libNixName "pq" = return "postgresql"
32+libNixName "pq" = return "postgresql"
33−libNixName "sndfile" = return "libsndfile"
33+libNixName "sndfile" = return "libsndfile"
34−libNixName "sqlite3" = return "sqlite"
34+libNixName "sqlite3" = return "sqlite"
35−libNixName "stdc++" = [] -- in stdenv
35+libNixName "stdc++" = [] -- in stdenv
36+libNixName "X11" = return "libX11"
36−libNixName "xft" = return "libXft"
37+libNixName "xft" = return "libXft"
37−libNixName "X11" = return "libX11"
38−libNixName "z" = return "zlib"
38+libNixName "z" = return "zlib"
39−libNixName x = return x
39+libNixName x = return x