4 files changed, 38 insertions, 5 deletions
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index e82f0f4bfd9ab..8244f7c6324b5 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,20 +1,25 @@
 { sslSupport ? true
-, stdenv, fetchurl, pkgconfig, gtk, glib, openssl ? null, gdkpixbuf ? null
+, gpgSupport ? false
+, stdenv, fetchurl, pkgconfig, gtk, glib
+, openssl ? null
+, gpgme ? null
 }:
 
 assert sslSupport -> openssl != null;
+assert gpgSupport -> gpgme != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-2.1.3";
+  name = "sylpheed-2.1.9";
 
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.3.tar.bz2;
-    md5 = "57f874501c5b0e52b8ec1959fe0359be";
+    url = http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.9.tar.bz2;
+    md5 = "fe05714e5037d56ccdcf4b36fe4e9346";
   };
 
   buildInputs = [
     pkgconfig glib gtk
     (if sslSupport then openssl else null)
+    (if gpgSupport then gpgme else null)
   ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
new file mode 100644
index 0000000000000..e96eb9c57f415
--- /dev/null
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, libgpgerror, gnupg}:
+
+stdenv.mkDerivation {
+  name = "gpgme-1.0.3";
+  src = fetchurl {
+    url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.3.tar.gz;
+    md5 = "4d33cbdf844fcee1c724e4cf2a32dd11";
+  };
+  buildInputs = [libgpgerror gnupg];
+}
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
new file mode 100644
index 0000000000000..797002d2c81ca
--- /dev/null
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libgpg-error-1.0";
+  src = fetchurl {
+    url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.0.tar.gz;
+    md5 = "ff409db977e4a4897aa09ea420a28a2f";
+  };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 828ec07119ad3..7033d34a404b6 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1074,6 +1074,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  libgpgerror = (import ../development/libraries/libgpg-error) {
+    inherit fetchurl stdenv;
+  };
+
+  gpgme = (import ../development/libraries/gpgme) {
+    inherit fetchurl stdenv libgpgerror gnupg;
+  };
+
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxon = (import ../development/libraries/java/saxon) {
@@ -1589,9 +1597,10 @@ rec {
   };
 
   sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
-    inherit fetchurl stdenv pkgconfig openssl;
+    inherit fetchurl stdenv pkgconfig openssl gpgme;
     inherit (gtkLibs) glib gtk;
     sslSupport = true;
+    gpgSupport = true;
   };
 
   valknut = (import ../applications/networking/p2p/valknut) {