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

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

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

2
pkgs/development/libraries/serf/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" \ scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" \
APU="$(echo "${aprutil}"/bin/*-config)" CC="${ APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
}" ${ }" ${
if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""

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

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = '' configureFlags = ''
--with-apr=${apr.dev} --with-apr=${apr.dev}
--with-apr-util=${aprutil} --with-apr-util=${aprutil.dev}
--with-z=${zlib} --with-z=${zlib}
--with-pcre=${pcre} --with-pcre=${pcre}
--disable-maintainer-mode --disable-maintainer-mode

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.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include"
''; '';
}; };

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

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre}" "--with-pcre=${pcre}"
"--with-apr=${apr.dev}" "--with-apr=${apr.dev}"
"--with-apu=${aprutil}/bin/apu-1-config" "--with-apu=${aprutil.dev}/bin/apu-1-config"
"--with-libxml=${libxml2}" "--with-libxml=${libxml2}"
]; ];

2
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.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/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.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/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\""

2
pkgs/top-level/python-packages.nix
View File

@ -18659,7 +18659,7 @@ in modules // {
++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []);
# There seems to be no way to pass that path to configure. # There seems to be no way to pass that path to configure.
NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1";
preConfigure = '' preConfigure = ''
cd Source cd Source