diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-26 13:59:12 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-26 13:59:12 +0000 |
| commit | 228c6e0c1f900167f24bdb312b041245d5159943 (patch) | |
| tree | ef872c5f92b6150ce08841349c5bcae0eab50515 /pkgs/applications/networking | |
| parent | 2e15430e47809a05219e59a9f12230c99bf2e79a (diff) | |
| parent | 3f287cfb1d3571e8149c47a0460d15282e47dc45 (diff) | |
| download | nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar.gz nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar.bz2 nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar.lz nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar.xz nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.tar.zst nixpkgs-228c6e0c1f900167f24bdb312b041245d5159943.zip | |
* Merged the x-updates branch (latest X server / libraries, GTK+,
Fontconfig, etc.). svn path=/nixpkgs/trunk/; revision=22735
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 26 insertions, 6 deletions
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index ea0cb9a4ad8..b981c105a0c 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "chatzilla-0.9.85"; +stdenv.mkDerivation rec { + name = "chatzilla-0.9.86"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.85-xr.zip; - sha256 = "0jd7mq05715vad82sl4ycr7ga587k53dijxz371y3zwpf8479hqx"; + url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86-xr.zip; + sha256 = "1z8767arx2ncch0pzkdzhisjgmd45qianahz3xr8isvahv2klj5x"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; buildCommand = '' ensureDir $out diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 86e6873f4b4..fbc9a08bd68 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -14,16 +14,21 @@ assert saslSupport -> cyrus_sasl != null; stdenv.mkDerivation { name = "mutt-1.5.20"; + src = fetchurl { url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz; sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm"; }; + + patches = [ ./openssl.patch ]; + buildInputs = [ ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) ]; + configureFlags = [ "--with-mailpath=" "--enable-smtp" # The next allows building mutt without having anything setgid diff --git a/pkgs/applications/networking/mailreaders/mutt/openssl.patch b/pkgs/applications/networking/mailreaders/mutt/openssl.patch new file mode 100644 index 00000000000..6476075d67d --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt/openssl.patch @@ -0,0 +1,15 @@ +Fixes a compilation problem with OpenSSL 1.0.0. +From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261 + +diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c +--- mutt-1.5.20-orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200 ++++ mutt-1.5.20/mutt_ssl.c 2010-07-24 10:46:08.000000000 +0200 +@@ -652,7 +652,7 @@ + char *buf = NULL; + int bufsize; + /* needed to get the DNS subjectAltNames: */ +- STACK *subj_alt_names; ++ STACK_OF(GENERAL_NAME) *subj_alt_names; + int subj_alt_names_count; + GENERAL_NAME *subj_alt_name; + /* did we find a name matching hostname? */ |