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

its own copies.

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

pkgs/servers/http/apache-modules/mod_python/builder.sh

@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-installFlags="LIBEXECDIR=$out/modules $installFlags"
-
-ensureDir $out/modules
-
-genericBuild

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
 
-  inherit apacheHttpd;
+    # 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
+  '';
+
+  passthru = { inherit apacheHttpd; };
+  
   buildInputs = [apacheHttpd python];
 }