Merge master into staging-next

2018-12-07 15:22:35 +01:00
parent 13ee78018c cb2a447c51
commit 5f554279ec
224 changed files with 5366 additions and 4075 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
-  webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
-  libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
+  webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
+  libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
  hicolor-icon-theme, wrapGAppsHook
 }:

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    webkitgtk
    openssl
    libnotify
-    enchant
+    gtkspell3
    gpgme
    libcanberra-gtk3
    gtksourceview
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
    "--with-ssl"
    "--with-unique"
    "--without-gnome"
+    "--with-spell-checker=gtkspell"
  ];

  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";