From 29694b43b6256312ab96da8c72815ddd58a10043 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:41:26 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of apr is used --- pkgs/applications/networking/cluster/mesos/default.nix | 2 +- .../version-management/git-and-tools/svn2git-kde/default.nix | 2 +- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/development/libraries/serf/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/http/nginx/modules.nix | 2 +- pkgs/tools/security/modsecurity/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 7efd34dee56..bc6367a8055 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -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}" diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index e8f9078a839..076d5d5dfe0 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -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 diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 6f0956f1d1d..24483227d22 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -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}" diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 20ce1dabf9a..30295bb4498 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -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" }" ${ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bc7fd1441c1..848bb12b0a6 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -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} diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f667b6489e0..993ddf0920b 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -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" ''; }; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index ae635fd3251..3e880391fc3 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -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}" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d384803464a..3af4a11448a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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\""