git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #269 from hamishmack/gtksouceview3
7e5a37fPeter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1
@@ -103,6 +103,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags (Packag
103 | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!
103 | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!
104 | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])
104 | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])
105 | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
105 | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
106+ | i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])
106 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
107 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
107 | otherwise = bindNull i
108 | otherwise = bindNull i
108
109
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
@@ -70,6 +70,7 @@ libNixName "gthread-2.0" = return "glib"
70libNixName "gtk+-2.0" = return "gtk2"
70libNixName "gtk+-2.0" = return "gtk2"
71libNixName "gtk+-3.0" = return "gtk3"
71libNixName "gtk+-3.0" = return "gtk3"
72libNixName "gtk-x11-2.0" = return "gtk_x11"
72libNixName "gtk-x11-2.0" = return "gtk_x11"
73+libNixName "gtksourceview-3.0" = return "gtksourceview3"
73libNixName "hidapi-libusb" = return "hidapi"
74libNixName "hidapi-libusb" = return "hidapi"
74libNixName "icudata" = return "icu"
75libNixName "icudata" = return "icu"
75libNixName "icui18n" = return "icu"
76libNixName "icui18n" = return "icu"