* Apache httpd: build against apr, aputil and pcre instead of using
its own copies. svn path=/nixpkgs/trunk/; revision=12971
This commit is contained in:
@@ -5,11 +5,11 @@
|
||||
assert bdbSupport -> db4 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-util-1.2.12";
|
||||
name = "apr-util-1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.apache.org/dist/apr/apr-util-1.2.12.tar.bz2;
|
||||
sha256 = "152xwaxikp22acz7ypqsvlyjxhak6p40805wwbw7hcg1gyg2scyl";
|
||||
url = mirror://apache/apr/apr-util-1.3.4.tar.bz2;
|
||||
sha256 = "1kin1yh42sk7hw81x3aynjf2g0k07n6707426c2mi6fh6lr0lys4";
|
||||
};
|
||||
|
||||
configureFlags = ''
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-1.2.12";
|
||||
name = "apr-1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.apache.org/dist/apr/apr-1.2.12.tar.bz2;
|
||||
sha256 = "0d11wa2hlhb5lnny5rcazca056b35kgccx94cd38bazw1d6b68nv";
|
||||
url = mirror://apache/apr/apr-1.3.3.tar.bz2;
|
||||
sha256 = "0dyxw3km88f0li1d39vyr09670yb12xn8j1h8dq331kc6rw3npyr";
|
||||
};
|
||||
|
||||
# For now, disable detection of epoll to ensure that Apache still
|
||||
# runs on Linux 2.4 kernels. Once we've dropped support for 2.4 in
|
||||
# Nixpkgs, this can go. In general, it's a problem that APR
|
||||
# detects characteristics of the build system's kernel to decide
|
||||
# what to use at runtime, since it's impure.
|
||||
#apr_cv_epoll = "no";
|
||||
|
||||
meta = {
|
||||
homepage = http://apr.apache.org/;
|
||||
description = "The Apache Portable Runtime library";
|
||||
|
||||
Reference in New Issue
Block a user