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

treewide: Make explicit that 'dev' output of apacheHttpd is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:40:54 +03:00 committed by Vladimír Čunát
parent 4e6b45d0a0
commit 16cc4ac83b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/subversion/default.nix
View File

@ -39,7 +39,7 @@ let
configureFlags = '' configureFlags = ''
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
--disable-keychain --disable-keychain

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

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc";
}; };
configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}";
sourceRoot = "${name}-src/native"; sourceRoot = "${name}-src/native";

2
pkgs/servers/http/nginx/modules.nix
View File

@ -55,7 +55,7 @@
src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity";
inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include"
''; '';
}; };

2
pkgs/tools/security/modsecurity/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"--enable-standalone-module" "--enable-standalone-module"
"--enable-static" "--enable-static"
"--with-curl=${curl}" "--with-curl=${curl}"
"--with-apxs=${apacheHttpd}/bin/apxs" "--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre}" "--with-pcre=${pcre}"
"--with-apr=${apr}" "--with-apr=${apr}"
"--with-apu=${aprutil}/bin/apu-1-config" "--with-apu=${aprutil}/bin/apu-1-config"

4
pkgs/top-level/perl-packages.nix
View File

@ -6720,7 +6720,7 @@ let self = _self // overrides; _self = with self; {
}; };
buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ];
propagatedBuildInputs = [ mod_perl2 ]; propagatedBuildInputs = [ mod_perl2 ];
makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config"; makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
preConfigure = '' preConfigure = ''
# override broken prereq check # override broken prereq check
substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\"" substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""
@ -6731,7 +6731,7 @@ let self = _self // overrides; _self = with self; {
installPhase = '' installPhase = ''
mkdir $out mkdir $out
make install DESTDIR=$out make install DESTDIR=$out
cp -r $out/${pkgs.apacheHttpd}/. $out/. cp -r $out/${pkgs.apacheHttpd.dev}/. $out/.
cp -r $out/$out/. $out/. cp -r $out/$out/. $out/.
rm -r $out/nix rm -r $out/nix
''; '';