diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-04 15:26:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-04 15:27:32 +0100 |
| commit | 34b5d193c0c0c02bd0f17b8af9d8fa9422c75782 (patch) | |
| tree | 32d940872a4dc532bb7ed0e9d884b2c0696d60a5 /pkgs/servers/http | |
| parent | 231fa2b5e2f18c6b1e15c0fd7ba1577127fc9d40 (diff) | |
| download | nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar.gz nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar.bz2 nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar.lz nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar.xz nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.tar.zst nixlib-34b5d193c0c0c02bd0f17b8af9d8fa9422c75782.zip | |
apache*: don't change layout in $out WRT master
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 88e1475342c6..250c1c97ced3 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { # FIXME: -dev depends on -doc outputs = [ "dev" "out" "doc" ]; + setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++ stdenv.lib.optional sslSupport openssl; @@ -46,6 +47,8 @@ stdenv.mkDerivation rec { --enable-disk-cache --enable-file-cache --enable-mem-cache + --includedir=$(dev)/include + --docdir=$(doc)/share/doc ''; enableParallelBuilding = true; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 780eae8132d4..9049b0122fd7 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { # FIXME: -dev depends on -doc outputs = [ "dev" "out" "doc" ]; + setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [perl] ++ optional sslSupport openssl ++ @@ -54,6 +55,8 @@ stdenv.mkDerivation rec { ${optionalString sslSupport "--enable-ssl"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} + --includedir=$(dev)/include + --docdir=$(doc)/share/doc ''; enableParallelBuilding = true; |