* Upgrades.

svn path=/nixpkgs/trunk/; revision=853
This commit is contained in:
Eelco Dolstra 2004-03-27 15:48:19 +00:00
parent 158aa95f52
commit 4f155b0f7a
4 changed files with 27 additions and 46 deletions

View File

@ -1,20 +1,16 @@
#! /bin/sh
#! /bin/sh -e
buildinputs="$gtk $gdkpixbuf $openssl"
. $stdenv/setup || exit 1
buildInputs="$gtk $gdkpixbuf $openssl"
. $stdenv/setup
if test $sslSupport; then
extraflags="--enable-ssl $extraflags"
configureFlags="--enable-ssl $extraflags"
fi
if test $imageSupport; then
extraflags="--enable-gdk-pixbuf $extraflags"
configureFlags="--enable-gdk-pixbuf $extraflags"
else
extraflags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
fi
configureFlags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
fi
tar xvfj $src || exit 1
cd sylpheed-* || exit 1
./configure --prefix=$out $extraflags || exit 1
make || exit 1
make install || exit 1
genericBuild

View File

@ -3,25 +3,23 @@
, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null
}:
assert !isNull gtk;
assert sslSupport -> !isNull openssl;
assert imageSupport -> !isNull gdkpixbuf;
assert gtk != null;
assert sslSupport -> openssl != null;
assert imageSupport -> gdkpixbuf != null;
derivation {
name = "sylpheed-0.9.8a";
name = "sylpheed-0.9.10";
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.8a.tar.bz2;
md5 = "6ac823f06d8fe4f265f37d9c96068e05";
url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.10.tar.bz2;
md5 = "4e2242436de3cf3977a1b25b1ddc4930";
};
sslSupport = sslSupport;
imageSupport = imageSupport;
inherit sslSupport imageSupport;
stdenv = stdenv;
gtk = gtk;
inherit stdenv gtk;
openssl = if sslSupport then openssl else null;
gdkpixbuf = if imageSupport then gdkpixbuf else null;
}

View File

@ -1,10 +1,5 @@
#! /bin/sh
#! /bin/sh -e
buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd pan-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
buildInputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre"
. $stdenv/setup
genericBuild

View File

@ -3,29 +3,21 @@
, libxml2, perl, pcre
}:
assert !isNull pkgconfig && !isNull gtk && !isNull gnet
&& !isNull libxml2 && !isNull perl && !isNull pcre;
assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk;
assert pkgconfig != null && gtk != null && gnet != null
&& libxml2 != null && perl != null && pcre != null;
assert spellChecking -> gtkspell != null && gtk == gtkspell.gtk;
assert gtk.glib == gnet.glib;
derivation {
name = "pan-0.14.2.90";
name = "pan-0.14.2.91";
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://pan.rebelbase.com/download/releases/0.14.2.90/SOURCE/pan-0.14.2.90.tar.bz2;
md5 = "03e6d936254e775a94995ba261be23eb";
url = http://pan.rebelbase.com/download/releases/0.14.2.91/SOURCE/pan-0.14.2.91.tar.bz2;
md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
};
spellChecking = spellChecking;
stdenv = stdenv;
pkgconfig = pkgconfig;
gtk = gtk;
gtkspell = if spellChecking then gtkspell else null;
gnet = gnet;
libxml2 = libxml2;
perl = perl;
pcre = pcre;
inherit spellChecking stdenv pkgconfig gtk gnet libxml2 perl pcre;
}