git.iko.soy/typeable/cabal2nix
on master help sign in
Greatly extended 'libNixName' and 'buildToolNixName'.
commit84fbf30059614c6cca87ea49f86ac6ae514eabe3 authorPeter Simons <simons@cryp.to> dateTue 23 Aug 2011, 12:33 (15 years ago) parent638122c
2 files changed+15−4
compare with master
unifiedsplit
src/Cabal2Nix/Name.hs+14−3 src/Cabal2Nix/Package.hs+1−1
src/Cabal2Nix/Name.hs+14−3
@@ -23,12 +23,20 @@ libNixName "cairo-ps" = return "cairo"
2323libNixName "cairo" = return "cairo"
2424libNixName "cairo-svg" = return "cairo"
2525libNixName "crypto" = return "openssl"
26+libNixName "glib-2.0" = return "glib"
2627libNixName "gnome-keyring-1" = return "gnome_keyring"
2728libNixName "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"
2833libNixName "idn" = return "idn"
34+libNixName "libglade-2.0" = return "libglade"
2935libNixName "libidn" = return "idn"
36+libNixName "librsvg-2.0" = return "librsvg"
3037libNixName "libzip" = return "libzip"
3138libNixName "m" = [] -- in stdenv
39+libNixName "pangocairo" = return "pango"
3240libNixName "pcre" = return "pcre"
3341libNixName "pq" = return "postgresql"
3442libNixName "sndfile" = return "libsndfile"
@@ -40,6 +48,9 @@ libNixName "z" = return "zlib"
4048libNixName x = return x
4149
4250-- | Map build tool names to Nix attribute names.
43−buildToolNixName :: String -> String
44−buildToolNixName "cabal" = "cabalInstall"
45−buildToolNixName x = toNixName x
51+buildToolNixName :: String -> [String]
52+buildToolNixName "cabal" = return "cabalInstall"
53+buildToolNixName "gtk2hsC2hs" = return "gtk2hsBuildtools"
54+buildToolNixName "gtk2hsHookGenerator" = return "gtk2hsBuildtools"
55+buildToolNixName "gtk2hsTypeGen" = return "gtk2hsBuildtools"
56+buildToolNixName x = return (toNixName x)
src/Cabal2Nix/Package.hs+1−1
@@ -73,4 +73,4 @@ normalizeNixLibs :: [String] -> [String]
7373normalizeNixLibs = normalizeList . concatMap libNixName
7474
7575normalizeNixBuildTools :: [String] -> [String]
76−normalizeNixBuildTools = normalizeList . map buildToolNixName
76+normalizeNixBuildTools = normalizeList . concatMap buildToolNixName