diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-21 00:43:49 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:23:03 +0100 |
| commit | f302d78d6c8cbbcac418b8374445368931320c24 (patch) | |
| tree | ff9b96b07d1c5604bfebbfc50a397ded5102e975 /pkgs | |
| parent | 7a68c25baf2f4dfe64008bf3aae470429ca06055 (diff) | |
| download | nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar.gz nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar.bz2 nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar.lz nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar.xz nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.tar.zst nixpkgs-f302d78d6c8cbbcac418b8374445368931320c24.zip | |
apacheHttpd_2_4: Port multiple-output changes from 2.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 1ab3eaf0382..aa155978ea3 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -22,11 +22,18 @@ stdenv.mkDerivation rec { sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc"; }; + # FIXME: -dev depends on -doc + outputs = [ "dev" "out" "doc" ]; + buildInputs = [perl] ++ optional sslSupport openssl ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2; + patchPhase = '' + sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" + ''; + # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; @@ -48,13 +55,15 @@ stdenv.mkDerivation rec { ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} ''; + enableParallelBuilding = true; + postInstall = '' - echo "removing manual" - rm -rf $out/manual + mkdir -p $doc/share/doc/httpd + mv $out/manual $doc/share/doc/httpd + mkdir -p $dev/bin + mv $out/bin/apxs $dev/bin/apxs ''; - enableParallelBuilding = true; - passthru = { inherit apr aprutil sslSupport proxySupport ldapSupport; }; |