Author: guibert
Date: 2010-06-26 14:23:22 +0000 (Sat, 26 Jun 2010)
New Revision: 22421

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22421&view=rev

Modified:
   nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
thunderbird: 3.1

Changes:

Modified: 
nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
===================================================================
--- nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix  
2010-06-26 12:35:35 UTC (rev 22420)
+++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix  
2010-06-26 14:23:22 UTC (rev 22421)
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
 , dbus_glib, bzip2, alsaLib, nspr
+, libnotify, cairo, pixman, fontconfig
 
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Shredder", enable this option.  However, those
@@ -10,19 +11,22 @@
     
 }:
 
-let version = "3.0.5"; in
+let version = "3.1"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = 
"http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";;
-    sha1 = "c51b6c6a9357578beb7440e4d3cf4594a61fd6a7";
+    sha1 = "89e9d8099a5437ce401577fc4d526eb0dd9e51da";
   };
 
   buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr ];
+    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr 
libnotify
+      libnotify cairo pixman fontconfig ];
 
+  NIX_LDFLAGS = "-lpixman-1";
+
   configureFlags =
     [ "--enable-application=mail"
       "--enable-optimize"
@@ -34,6 +38,7 @@
       "--with-system-nspr"
       "--enable-system-cairo"
       "--disable-crashreporter"
+      "--disable-necko-wifi"
       "--disable-tests"
       "--enable-static" # required by `make install'
     ]

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-26 12:35:35 UTC 
(rev 22420)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-26 14:23:22 UTC 
(rev 22421)
@@ -8747,7 +8747,8 @@
   };
 
   thunderbird3 = lowPrio (import 
../applications/networking/mailreaders/thunderbird/3.x.nix {
-    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib 
nspr;
+    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib 
nspr libnotify cairo fontconfig;
+    inherit (xorg) pixman;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
   });

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to