public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apache*: don't change layout in $out WRT master

This commit is contained in:
Vladimír Čunát 2015-12-04 15:26:06 +01:00
parent 231fa2b5e2
commit 34b5d193c0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/http/apache-httpd/2.2.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
# FIXME: -dev depends on -doc # FIXME: -dev depends on -doc
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.
buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++ buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
stdenv.lib.optional sslSupport openssl; stdenv.lib.optional sslSupport openssl;
@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
--enable-disk-cache --enable-disk-cache
--enable-file-cache --enable-file-cache
--enable-mem-cache --enable-mem-cache
--includedir=$(dev)/include
--docdir=$(doc)/share/doc
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
# FIXME: -dev depends on -doc # FIXME: -dev depends on -doc
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.
buildInputs = [perl] ++ buildInputs = [perl] ++
optional sslSupport openssl ++ optional sslSupport openssl ++
@ -54,6 +55,8 @@ stdenv.mkDerivation rec {
${optionalString sslSupport "--enable-ssl"} ${optionalString sslSupport "--enable-ssl"}
${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
--includedir=$(dev)/include
--docdir=$(doc)/share/doc
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;