git.iko.soy/typeable/cabal2nix
on master help sign in
Use gnome3.gtksourceview for GtkSourceView-3.0

The pkg-config package `GtkSourceView-3.0` is Gtk 3 only, however hackage2nix currently picks `pkgs.gnome2.gtksourceview` (provides `GtkSourceView-2.0`). We need `pkgs.gnome3.gtksourceview`. This change picks the correct package to use in the same way `pkgs.gnome3.gtk` is picked for `Gtk+-3.0`.

commita9e8e8a690e8d79e778b59319cda51dd79a4e275 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateThu 13 Apr 2017, 15:37 (10 years ago) parent9e55aab
2 files changed+2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1
@@ -103,6 +103,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags (Packag
103103 | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!
104104 | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])
105105 | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
106+ | i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])
106107 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
107108 | otherwise = bindNull i
108109
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
@@ -70,6 +70,7 @@ libNixName "gthread-2.0" = return "glib"
7070libNixName "gtk+-2.0" = return "gtk2"
7171libNixName "gtk+-3.0" = return "gtk3"
7272libNixName "gtk-x11-2.0" = return "gtk_x11"
73+libNixName "gtksourceview-3.0" = return "gtksourceview3"
7374libNixName "hidapi-libusb" = return "hidapi"
7475libNixName "icudata" = return "icu"
7576libNixName "icui18n" = return "icu"