Merge branch 'master' into staging

pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ];
 
-  configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs" "--exec-prefix=$out"];
+  configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"];
 
   installPhase = ''
     mkdir -p $out/bin

pkgs/servers/http/apache-modules/mod_fastcgi/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     cp Makefile.AP2 Makefile
-    makeFlags="top_dir=${apacheHttpd}/share prefix=$out"
+    makeFlags="top_dir=${apacheHttpd.dev}/share prefix=$out"
   '';
 
   meta = {