dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

apache modules: fix build problems

Browse Source 
pkgs.mod_evasive was removed, because that combination isn't supported
(according to an assertion).
This commit is contained in:
Vladimír Čunát 2015-12-05 13:15:41 +01:00
parent 2709a815e5
commit 6cc57be289
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc. setOutputFlags = false; # it would move $out/modules, etc.
buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++ propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often
buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++
stdenv.lib.optional sslSupport openssl; stdenv.lib.optional sslSupport openssl;
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.
@ -34,6 +35,9 @@ stdenv.mkDerivation rec {
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
''; '';
preConfigure = ''
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = '' configureFlags = ''
--with-z=${zlib} --with-z=${zlib}
--with-pcre=${pcre} --with-pcre=${pcre}
@ -47,7 +51,6 @@ 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 --docdir=$(doc)/share/doc
''; '';

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

@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
preConfigure = ''
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = '' configureFlags = ''
--with-apr=${apr} --with-apr=${apr}
--with-apr-util=${aprutil} --with-apr-util=${aprutil}
@ -55,7 +58,6 @@ 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 --docdir=$(doc)/share/doc
''; '';

2
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
cp Makefile.AP2 Makefile cp Makefile.AP2 Makefile
makeFlags="top_dir=${apacheHttpd} prefix=$out" makeFlags="top_dir=${apacheHttpd}/share prefix=$out"
''; '';
meta = { meta = {

1
pkgs/top-level/all-packages.nix
View File

@ -9239,7 +9239,6 @@ let
# Backwards compatibility. # Backwards compatibility.
mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
mod_evasive = pkgs.apacheHttpdPackages.mod_evasive;
mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
mod_python = pkgs.apacheHttpdPackages.mod_python; mod_python = pkgs.apacheHttpdPackages.mod_python;
mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;