colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Upgrades.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/mailreaders/sylpheed/builder.sh
View File

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

18
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

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

13
pkgs/applications/networking/newsreaders/pan/builder.sh
View File

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

22
pkgs/applications/networking/newsreaders/pan/default.nix
View File

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