b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Upgrade to 2.0.49.

Browse source 
svn path=/nixpkgs/trunk/; revision=851
This commit is contained in:
Eelco Dolstra 2004-03-27 15:47:48 +00:00
parent 4df6ec860c
commit ee40be39a4
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/servers/http/apache-httpd/builder.sh
View file

@ -1,23 +1,25 @@
#! /bin/sh #! /bin/sh -e
buildinputs="$openssl $db4 $expat $perl" buildInputs="$openssl $db4 $expat $perl"
. $stdenv/setup || exit 1 . $stdenv/setup
configureFlags="--with-expat=$expat --enable-mods-shared=all --without-gdbm \
--enable-threads --with-devrandom=/dev/urandom"
if test $db4Support; then if test $db4Support; then
extraflags="--with-berkeley-db=$db4 $extraflags" configureFlags="--with-berkeley-db=$db4 $configureFlags"
fi fi
if test $sslSupport; then if test $sslSupport; then
extraflags="--enable-ssl --with-ssl=$openssl $extraflags" configureFlags="--enable-ssl --with-ssl=$openssl $configureFlags"
fi fi
tar xvfz $src || exit 1
cd httpd-* || exit 1 postInstall() {
./configure --prefix=$out \ echo "removing manual"
--with-expat=$expat --enable-mods-shared=all --without-gdbm \ rm -rf $out/manual
--enable-threads --with-devrandom=/dev/urandom \ }
$extraflags || exit 1 postInstall=postInstall
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1 genericBuild
rm -rf $out/manual || exit 1

23
pkgs/servers/http/apache-httpd/default.nix
View file

@ -2,26 +2,23 @@
, sslSupport, db4Support , sslSupport, db4Support
}: }:
assert sslSupport -> !isNull openssl; assert sslSupport -> openssl != null;
assert db4Support -> !isNull db4; assert db4Support -> db4 != null;
assert !isNull expat && !isNull perl; assert expat != null && perl != null;
derivation { derivation {
name = "apache-httpd-2.0.48"; name = "apache-httpd-2.0.49";
system = stdenv.system; system = stdenv.system;
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz; url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.49.tar.gz;
md5 = "466c63bb71b710d20a5c353df8c1a19c"; md5 = "275d3d37eed1b070f333d3618f7d1954";
}; };
sslSupport = sslSupport; inherit sslSupport db4Support;
db4Support = db4Support;
stdenv = stdenv; inherit stdenv perl expat;
perl = perl; openssl = if sslSupport then openssl else null;
openssl = if sslSupport then openssl else ""; db4 = if db4Support then db4 else null;
db4 = if db4Support then db4 else "";
expat = expat;
} }