git.iko.soy/typeable/cabal2nix
on master help sign in
Greatly extended 'libNixName' and 'buildToolNixName'.
84fbf30Peter Simons
src/Cabal2Nix/Name.hs+14−3
compare with master
unifiedsplit
@@ -23,12 +23,20 @@ libNixName "cairo-ps" = return "cairo"
23libNixName "cairo" = return "cairo"
23libNixName "cairo" = return "cairo"
24libNixName "cairo-svg" = return "cairo"
24libNixName "cairo-svg" = return "cairo"
25libNixName "crypto" = return "openssl"
25libNixName "crypto" = return "openssl"
26+libNixName "glib-2.0" = return "glib"
26libNixName "gnome-keyring-1" = return "gnome_keyring"
27libNixName "gnome-keyring-1" = return "gnome_keyring"
27libNixName "gnome-keyring" = return "gnome_keyring"
28libNixName "gnome-keyring" = return "gnome_keyring"
29+libNixName "gobject-2.0" = return "glib"
30+libNixName "gthread-2.0" = return "glib"
31+libNixName "gtk+-2.0" = return "gtk"
32+libNixName "gtksourceview-2.0" = return "gtksourceview"
28libNixName "idn" = return "idn"
33libNixName "idn" = return "idn"
34+libNixName "libglade-2.0" = return "libglade"
29libNixName "libidn" = return "idn"
35libNixName "libidn" = return "idn"
36+libNixName "librsvg-2.0" = return "librsvg"
30libNixName "libzip" = return "libzip"
37libNixName "libzip" = return "libzip"
31libNixName "m" = [] -- in stdenv
38libNixName "m" = [] -- in stdenv
39+libNixName "pangocairo" = return "pango"
32libNixName "pcre" = return "pcre"
40libNixName "pcre" = return "pcre"
33libNixName "pq" = return "postgresql"
41libNixName "pq" = return "postgresql"
34libNixName "sndfile" = return "libsndfile"
42libNixName "sndfile" = return "libsndfile"
@@ -40,6 +48,9 @@ libNixName "z" = return "zlib"
40libNixName x = return x
48libNixName x = return x
41
49
42-- | Map build tool names to Nix attribute names.
50-- | Map build tool names to Nix attribute names.
43−buildToolNixName :: String -> String
51+buildToolNixName :: String -> [String]
44−buildToolNixName "cabal" = "cabalInstall"
52+buildToolNixName "cabal" = return "cabalInstall"
53+buildToolNixName "gtk2hsC2hs" = return "gtk2hsBuildtools"
54+buildToolNixName "gtk2hsHookGenerator" = return "gtk2hsBuildtools"
55+buildToolNixName "gtk2hsTypeGen" = return "gtk2hsBuildtools"
45−buildToolNixName x = toNixName x
56+buildToolNixName x = return (toNixName x)
src/Cabal2Nix/Package.hs+1−1
@@ -73,4 +73,4 @@ normalizeNixLibs :: [String] -> [String]
73normalizeNixLibs = normalizeList . concatMap libNixName
73normalizeNixLibs = normalizeList . concatMap libNixName
74
74
75normalizeNixBuildTools :: [String] -> [String]
75normalizeNixBuildTools :: [String] -> [String]
76−normalizeNixBuildTools = normalizeList . map buildToolNixName
76+normalizeNixBuildTools = normalizeList . concatMap buildToolNixName