* Apache httpd: build against apr, aputil and pcre instead of using

  its own copies.

svn path=/nixpkgs/trunk/; revision=12971

1 files changed, 10 insertions, 3 deletions

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index ceae8a1d12a9..2c62232a490d 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -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";