Author: amiddelk
Date: Tue Jan 17 22:43:26 2012
New Revision: 31615
URL: https://nixos.org/websvn/nix/?rev=31615&sc=1
Log:
Update of the 'thunderbird' package to 9.0.1.
Note: this update simplified the nix expression, as some of the problems
mentioned in
the original expression do not seem present anymore.
Also note: the original expression did not compile in combination with the 3.1
kernel.
Added:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
- copied, changed from r31601,
nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
(from r31601,
nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
Mon Jan 16 23:36:05 2012 (r31601, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
Tue Jan 17 22:43:26 2012 (r31615)
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
-, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
+{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
+, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
, libnotify, cairo, pixman, fontconfig
+, libjpeg
, # If you want the resulting program to call itself "Thunderbird"
# instead of "Shredder", enable this option. However, those
@@ -11,42 +12,60 @@
}:
-let version = "7.0.1"; in
+let version = "9.0.1";
+
+ # This patch may become necessary when we use a more recent version of
libpng
+ # for now, it's actually not needed
+ # pngPatch = fetchurl {
+ # url =
http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
+ # sha256 =
"8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
+ # };
+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 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
+ sha256 =
"4fc392915e22b81ef0bd08e6e2d8d0348e66f0930f35bf8ac47eb49f64453e2d";
};
enableParallelBuilding = true;
buildInputs =
- [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr
libnotify
+ [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
libnotify cairo pixman fontconfig yasm mesa /* nss */
+ libjpeg
];
+ # fix some paths in pngPatch
+ # prePatch = ''
+ # substitute ${pngPatch} png.patch --replace "mozilla-release/modules/"
"comm-release/mozilla/modules/"
+ # '';
+
patches = [
+ # "png.patch" # produced by postUnpack
+
# Fix weird dependencies such as a so file which depends on "-lpthread".
- ./thunderbird-build-deps.patch
+ # ./thunderbird-build-deps.patch
];
- NIX_LDFLAGS = "-lpixman-1";
-
configureFlags =
[ "--enable-application=mail"
"--enable-optimize"
+ "--with-pthreads"
"--disable-debug"
"--enable-strip"
+ "--with-pthreads"
"--with-system-jpeg"
+ # "--with-system-png" # png 1.5.x not merged in nixpkgs yet
"--with-system-zlib"
- # "--with-system-bz2"
+ "--with-system-bz2"
"--with-system-nspr"
"--enable-system-cairo"
"--disable-crashreporter"
"--disable-necko-wifi"
+ "--disable-webm"
"--disable-tests"
"--enable-calendar"
]
@@ -71,7 +90,7 @@
--replace /bin/ls "$(type -tP ls)"
# Create a desktop item.
- mkdir -p $out/share/applications
+ ensureDir $out/share/applications
cat > $out/share/applications/thunderbird.desktop <<EOF
[Desktop Entry]
Type=Application
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 17 22:40:05
2012 (r31614)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 17 22:43:26
2012 (r31615)
@@ -7492,7 +7492,7 @@
thinkingRock = callPackage ../applications/misc/thinking-rock { };
- thunderbird = callPackage
../applications/networking/mailreaders/thunderbird/7.x.nix {
+ thunderbird = callPackage
../applications/networking/mailreaders/thunderbird/9.x.nix {
inherit (gnome) libIDL;
};
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
