From 50d826abea1e7bba63cbab1ae6ef965e455c1ba0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Jan 2005 20:22:48 +0000 Subject: [PATCH] * Sylpheed updated to 1.0.0. Also fixed OpenSSL support. svn path=/nixpkgs/trunk/; revision=1986 --- .../networking/mailreaders/sylpheed/builder.sh | 10 +++++----- .../networking/mailreaders/sylpheed/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/builder.sh b/pkgs/applications/networking/mailreaders/sylpheed/builder.sh index 85da4ac19b21..c90f8bae4619 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/builder.sh +++ b/pkgs/applications/networking/mailreaders/sylpheed/builder.sh @@ -1,14 +1,14 @@ buildInputs="$gtk $gdkpixbuf $openssl" . $stdenv/setup -if test $sslSupport; then - configureFlags="--enable-ssl $extraflags" +if test "$sslSupport" = 1; then + configureFlags="--enable-ssl $configureFlags" fi -if test $imageSupport; then - configureFlags="--enable-gdk-pixbuf $extraflags" +if test "$imageSupport" = 1; then + configureFlags="--enable-gdk-pixbuf $configureFlags" else - configureFlags="--disable-gdk-pixbuf --disable-imlibtest $extraflags" + configureFlags="--disable-gdk-pixbuf --disable-imlibtest $configureFlags" fi genericBuild diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 5e17c07880d2..cada3132e052 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -8,12 +8,12 @@ assert sslSupport -> openssl != null; assert imageSupport -> gdkpixbuf != null; stdenv.mkDerivation { - name = "sylpheed-1.0.0-pre-beta3"; + name = "sylpheed-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://sylpheed.good-day.net/sylpheed/sylpheed-1.0.0beta3.tar.bz2; - md5 = "44d98cc4ed490dfdb92016b7689396cf"; + url = http://sylpheed.good-day.net/sylpheed/sylpheed-1.0.0.tar.bz2; + md5 = "864c4fc581a5ab1c7af5e06153c76769"; }; inherit sslSupport imageSupport;