alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:41:26 +03:00 committed by Vladimír Čunát
parent 16cc4ac83b
commit 29694b43b6
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/cluster/mesos/default.nix
View file

@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--sbindir=\${out}/bin"
"--with-apr=${apr}"
"--with-apr=${apr.dev}"
"--with-svn=${subversion}"
"--with-leveldb=${leveldb}"
"--with-glog=${glog}"

2
pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582";
};
NIX_CFLAGS_COMPILE = [ "-I${apr}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
patchPhase = ''
sed -i 's|/bin/cat|cat|' ./src/repository.cpp

2
pkgs/development/libraries/apr-util/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = optional stdenv.isFreeBSD autoreconfHook;
configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ]
configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat}" ]
++ optional (!stdenv.isCygwin) "--with-crypto"
++ optional sslSupport "--with-openssl=${openssl}"
++ optional bdbSupport "--with-berkeley-db=${db}"

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

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

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

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = ''
--with-apr=${apr}
--with-apr=${apr.dev}
--with-apr-util=${aprutil}
--with-z=${zlib}
--with-pcre=${pcre}

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

@ -55,7 +55,7 @@
src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity";
inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ];
preConfigure = ''
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"
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"
'';
};

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"--with-curl=${curl}"
"--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre}"
"--with-apr=${apr}"
"--with-apr=${apr.dev}"
"--with-apu=${aprutil}/bin/apu-1-config"
"--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 ];
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}/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}/bin/apu-1-config";
preConfigure = ''
# override broken prereq check
substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""