* Thunderbird updated to 1.5 (it was at 0.8!).
svn path=/nixpkgs/trunk/; revision=4970
This commit is contained in:
parent
dbd586dfa7
commit
b06335a835
|
@ -1,23 +1,30 @@
|
||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
|
|
||||||
preConfigure() {
|
postInstall=postInstall
|
||||||
cat mail/config/mozconfig > .mozconfig
|
postInstall() {
|
||||||
cat >> .mozconfig <<EOF
|
|
||||||
ac_add_options --disable-debug
|
# Strip some more stuff
|
||||||
ac_add_options --enable-optimize=-O2
|
strip -S $out/lib/*/* || true
|
||||||
ac_add_options --disable-ldap
|
|
||||||
ac_add_options --enable-xft
|
# This fixes starting Thunderbird when there already is a running
|
||||||
ac_add_options --disable-freetype2
|
# instance. The `thunderbird' wrapper script actually expects to
|
||||||
ac_add_options --enable-swg
|
# be in the same directory as `run-mozilla.sh', apparently.
|
||||||
ac_add_options --enable-strip
|
libDir=$(cd $out/lib && ls -d thunderbird-*)
|
||||||
ac_add_options --enable-default-toolkit=gtk2
|
test -n "$libDir"
|
||||||
ac_add_options --enable-single-profile
|
cd $out/bin
|
||||||
ac_add_options --prefix=$out
|
mv thunderbird ../lib/$libDir/
|
||||||
EOF
|
ln -s ../lib/$libDir/thunderbird .
|
||||||
|
|
||||||
|
# Register extensions etc.
|
||||||
|
echo "running thunderbird -register..."
|
||||||
|
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./thunderbird-bin -register) || false
|
||||||
|
|
||||||
|
echo "running regxpcom..."
|
||||||
|
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
|
||||||
|
|
||||||
|
# Put the Thunderbird icon in the right place.
|
||||||
|
ensureDir $out/lib/$libDir/chrome/icons/default
|
||||||
|
ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/
|
||||||
}
|
}
|
||||||
|
|
||||||
preConfigure=preConfigure
|
|
||||||
|
|
||||||
makeFlags="-f client.mk build"
|
|
||||||
|
|
||||||
genericBuild
|
genericBuild
|
||||||
|
|
|
@ -1,18 +1,44 @@
|
||||||
{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
|
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
|
||||||
|
, libjpeg, libpng, zlib, cairo
|
||||||
|
|
||||||
|
, # If you want the resulting program to call itself "Thunderbird"
|
||||||
|
# instead of "Deer Park", enable this option. However, those
|
||||||
|
# binaries may not be distributed without permission from the
|
||||||
|
# Mozilla Foundation, see
|
||||||
|
# http://www.mozilla.org/foundation/trademarks/.
|
||||||
|
enableOfficialBranding ? false
|
||||||
|
|
||||||
|
}:
|
||||||
|
|
||||||
assert pkgconfig != null && gtk != null && perl != null
|
|
||||||
&& zip != null && libIDL != null;
|
|
||||||
|
|
||||||
# !!! assert libIDL.glib == gtk.glib;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "thunderbird-0.8";
|
name = "thunderbird-1.5";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://nix.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
|
url = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5/source/thunderbird-1.5-source.tar.bz2;
|
||||||
md5 = "76de1827d66ac482cfc4dd32e7b1e257";
|
md5 = "781c1cd1a01583d9b666d8c2fe4288e6";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig gtk perl zip libIDL];
|
buildInputs = [
|
||||||
|
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
|
||||||
|
];
|
||||||
|
inherit gtk;
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
"--enable-application=mail"
|
||||||
|
"--enable-optimize"
|
||||||
|
"--disable-debug"
|
||||||
|
"--enable-xft"
|
||||||
|
"--disable-freetype2"
|
||||||
|
"--enable-svg"
|
||||||
|
"--enable-strip"
|
||||||
|
"--enable-default-toolkit=gtk2"
|
||||||
|
"--with-system-jpeg"
|
||||||
|
"--with-system-png"
|
||||||
|
"--with-system-zlib"
|
||||||
|
"--with-system-cairo"
|
||||||
|
]
|
||||||
|
++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1907,17 +1907,13 @@ rec {
|
||||||
inherit (xlibs) libXmu;
|
inherit (xlibs) libXmu;
|
||||||
};
|
};
|
||||||
|
|
||||||
thunderbird =
|
thunderbird = import ../applications/networking/mailreaders/thunderbird {
|
||||||
(import ../build-support/make-symlinks) {
|
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
|
||||||
inherit stdenv;
|
inherit (gtkLibs) gtk;
|
||||||
dir =
|
inherit (gnome) libIDL;
|
||||||
(import ../applications/networking/mailreaders/thunderbird) {
|
inherit (xlibs) libXi;
|
||||||
inherit fetchurl stdenv pkgconfig perl zip;
|
#enableOfficialBranding = true;
|
||||||
inherit (gtkLibs) gtk;
|
};
|
||||||
inherit (gnome) libIDL;
|
|
||||||
};
|
|
||||||
files = ["bin/thunderbird" "lib/thunderbird-0.8/icons"];
|
|
||||||
};
|
|
||||||
|
|
||||||
lynx = (import ../applications/networking/browsers/lynx) {
|
lynx = (import ../applications/networking/browsers/lynx) {
|
||||||
inherit fetchurl stdenv ncurses openssl;
|
inherit fetchurl stdenv ncurses openssl;
|
||||||
|
|
Loading…
Reference in New Issue