mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
apache-httpd: Use multiple outputs
This commit is contained in:
parent
edff23e591
commit
cc61d31902
@ -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 = {
|
||||
|
@ -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;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user