apache-httpd: Use multiple outputs

This commit is contained in:
Eelco Dolstra 2013-06-13 11:57:17 +02:00
parent edff23e591
commit cc61d31902
2 changed files with 13 additions and 2 deletions

View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
};
outputs = [ "dev" "out" "doc" ];
buildInputs = [perl apr aprutil pcre] ++
stdenv.lib.optional sslSupport openssl;
@ -42,11 +44,19 @@ stdenv.mkDerivation rec {
--with-mpm=${mpm}
'';
preConfigure =
''
makeFlagsArray+=("installbuilddir=$dev/share/build")
'';
enableParallelBuilding = true;
stripDebugList = "lib modules bin";
postInstall = ''
echo "removing manual"
rm -rf $out/manual
mkdir -p $doc/share/doc/httpd
mv $out/manual $doc/share/doc/httpd
mkdir -p $out/share # FIXME, hack
'';
passthru = {

View File

@ -5621,6 +5621,7 @@ let
apacheHttpd = pkgs.apacheHttpd_2_2;
apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
stdenv = stdenvMulti;
sslSupport = true;
};