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

  its own copies.

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

3 files changed, 25 insertions, 33 deletions

diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index a4a76f9b4cb..853ed3b301a 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, openssl, db4, expat, perl, zlib
-, sslSupport, db4Support, proxySupport ? true
+{ stdenv, fetchurl, openssl, perl, zlib
+, sslSupport, proxySupport ? true
+, apr, aprutil, pcre
 }:
 
 assert sslSupport -> openssl != null;
-assert db4Support -> db4 != null;
-assert expat != null && perl != null;
 
 stdenv.mkDerivation {
   name = "apache-httpd-2.2.9";
@@ -14,23 +13,18 @@ stdenv.mkDerivation {
     md5 = "3afa8137dc1999be695a20b62fdf032b";
   };
 
-  #inherit sslSupport db4Support;
+  #inherit sslSupport;
 
-  buildInputs = [expat perl] ++
-    stdenv.lib.optional sslSupport openssl ++
-    stdenv.lib.optional db4Support db4;
+  buildInputs = [perl apr aprutil pcre] ++
+    stdenv.lib.optional sslSupport openssl;
 
   configureFlags = ''
-    --with-expat=${expat}
     --with-z=${zlib}
+    --with-pcre=${pcre}
     --enable-mods-shared=all
     --enable-authn-alias
     ${if proxySupport then "--enable-proxy" else ""}
-    --without-gdbm
-    --enable-threads
-    --with-devrandom=/dev/urandom
     ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
-    ${if db4Support then "--with-berkeley-db=${db4}" else ""}
   '';
 
   postInstall = ''
@@ -38,15 +32,8 @@ stdenv.mkDerivation {
     rm -rf $out/manual
   '';
 
-  # 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";
-
   passthru = {
-    inherit expat sslSupport db4Support proxySupport;
+    inherit apr aprutil sslSupport proxySupport;
   };
   
   meta = {
diff --git a/pkgs/servers/http/apache-modules/mod_python/builder.sh b/pkgs/servers/http/apache-modules/mod_python/builder.sh
deleted file mode 100644
index 77377caa854..00000000000
--- a/pkgs/servers/http/apache-modules/mod_python/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-installFlags="LIBEXECDIR=$out/modules $installFlags"
-
-ensureDir $out/modules
-
-genericBuild
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 4c83070e9ca..a59fa60c4c7 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -3,15 +3,27 @@
 stdenv.mkDerivation {
   name = "mod_python-3.3.1";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
-    url = http://archive.eu.apache.org/dist/httpd/modpython/mod_python-3.3.1.tgz;
+    url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz;
     sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd";
   };
 
-  patches = [./install.patch];
+  patches = [
+    ./install.patch
+
+    # See http://bugs.gentoo.org/show_bug.cgi?id=230211
+    (fetchurl {
+      url = "http://bugs.gentoo.org/attachment.cgi?id=160400";
+      sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj";
+    })
+  ];
+
+  preInstall = ''
+    installFlags="LIBEXECDIR=$out/modules $installFlags"
+    ensureDir $out/modules
+  '';
 
-  inherit apacheHttpd;
+  passthru = { inherit apacheHttpd; };
+  
   buildInputs = [apacheHttpd python];
 }