* Upgraded Glib, GTK, Sylpheed.

* Tried to upgrade Firefox to 0.9, but it's too broken.  It's
  basically impossible to build it automatically.  Firefox must be
  started once as a user with write permission to the Firefox
  directory to generate some files, and this can only be done
  interactively (apparently).  Hopefully 0.10 fixes this.  Firefox
  also barfs with link errors if the flag `--enable-single-profile' is
  not used.

svn path=/nixpkgs/trunk/; revision=1067
This commit is contained in:
Eelco Dolstra 2004-06-21 15:49:03 +00:00
parent 6ade14473a
commit 5503e2fc33
5 changed files with 58 additions and 9 deletions

View File

@ -0,0 +1,30 @@
. $stdenv/setup
preConfigure() {
cat > .mozconfig <<EOF
export MOZ_PHOENIX=1
mk_add_options MOZ_PHOENIX=1
ac_add_options --enable-crypto
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-mailnews
ac_add_options --disable-composer
ac_add_options --enable-optimize=-O2
ac_add_options --disable-ldap
ac_add_options --disable-mailnews
ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
ac_add_options --enable-xft
ac_add_options --enable-swg
ac_add_options --enable-strip
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --enable-single-profile
EOF
echo "ac_add_options --prefix=$out" >> .mozconfig
}
preConfigure=preConfigure
makeFlags="-f client.mk build"
genericBuild

View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
}:
assert pkgconfig != null && gtk != null && perl != null
&& zip != null && libIDL != null;
# !!! assert libIDL.glib == gtk.glib;
stdenv.mkDerivation {
name = "firefox-0.9";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9/firefox-0.9-source.tar.bz2;
md5 = "1dda543d1245db09cea9ad7b9a44146c";
};
buildInputs = [pkgconfig gtk perl zip libIDL];
}

View File

@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
assert imageSupport -> gdkpixbuf != null;
stdenv.mkDerivation {
name = "sylpheed-0.9.10";
name = "sylpheed-0.9.12";
builder = ./builder.sh;
src = fetchurl {
url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.10.tar.bz2;
md5 = "4e2242436de3cf3977a1b25b1ddc4930";
url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.12.tar.bz2;
md5 = "5deab7d65f8e19444902be3d82610e6b";
};
inherit sslSupport imageSupport;

View File

@ -3,10 +3,10 @@
assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation {
name = "glib-2.4.0";
name = "glib-2.4.2";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.0.tar.bz2;
md5 = "0f5f4896782ec7ab6ea8c7c1d9958114";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.2.tar.bz2;
md5 = "038b7cf535cbe016c6bb6033dbcf9acf";
};
buildInputs = [pkgconfig gettext perl];
}

View File

@ -10,10 +10,10 @@ assert x11.buildClientLibs;
#assert x11 == pango.x11;
stdenv.mkDerivation {
name = "gtk+-2.4.0";
name = "gtk+-2.4.3";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.0.tar.bz2;
md5 = "fd16157de447c7f0a86495ad0dc67a1b";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.3.tar.bz2;
md5 = "debfd0fcef08683c0761f13e1ba2dced";
};
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];