* Updated Sylpheed to 2.1.9 and added GPG support (through gpgme).
svn path=/nixpkgs/trunk/; revision=4400
This commit is contained in:
parent
272e44da1c
commit
fd5e5e34a4
@ -1,20 +1,25 @@
|
|||||||
{ sslSupport ? true
|
{ 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 sslSupport -> openssl != null;
|
||||||
|
assert gpgSupport -> gpgme != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "sylpheed-2.1.3";
|
name = "sylpheed-2.1.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.3.tar.bz2;
|
url = http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.9.tar.bz2;
|
||||||
md5 = "57f874501c5b0e52b8ec1959fe0359be";
|
md5 = "fe05714e5037d56ccdcf4b36fe4e9346";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig glib gtk
|
pkgconfig glib gtk
|
||||||
(if sslSupport then openssl else null)
|
(if sslSupport then openssl else null)
|
||||||
|
(if gpgSupport then gpgme else null)
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
10
pkgs/development/libraries/gpgme/default.nix
Normal file
10
pkgs/development/libraries/gpgme/default.nix
Normal file
@ -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];
|
||||||
|
}
|
9
pkgs/development/libraries/libgpg-error/default.nix
Normal file
9
pkgs/development/libraries/libgpg-error/default.nix
Normal file
@ -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";
|
||||||
|
};
|
||||||
|
}
|
@ -1074,6 +1074,14 @@ rec {
|
|||||||
inherit fetchurl stdenv;
|
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
|
### DEVELOPMENT / LIBRARIES / JAVA
|
||||||
|
|
||||||
saxon = (import ../development/libraries/java/saxon) {
|
saxon = (import ../development/libraries/java/saxon) {
|
||||||
@ -1589,9 +1597,10 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
|
sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
|
||||||
inherit fetchurl stdenv pkgconfig openssl;
|
inherit fetchurl stdenv pkgconfig openssl gpgme;
|
||||||
inherit (gtkLibs) glib gtk;
|
inherit (gtkLibs) glib gtk;
|
||||||
sslSupport = true;
|
sslSupport = true;
|
||||||
|
gpgSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
valknut = (import ../applications/networking/p2p/valknut) {
|
valknut = (import ../applications/networking/p2p/valknut) {
|
||||||
|
Loading…
Reference in New Issue
Block a user