diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-13 11:57:17 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-13 11:57:17 +0200 |
| commit | cc61d31902d67b94333f53a5ab5772330bbc21cc (patch) | |
| tree | 1d9f0202e9540a6fa47bbc6a732308c3f257f758 /pkgs | |
| parent | edff23e5916561898e09414cc8787fc639327f50 (diff) | |
| download | nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar.gz nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar.bz2 nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar.lz nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar.xz nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.tar.zst nixlib-cc61d31902d67b94333f53a5ab5772330bbc21cc.zip | |
apache-httpd: Use multiple outputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index ba0bde633584..a904cae56b19 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ef4d6761ea8..86c5c63a0ccb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |