From d298b52fd35a2416128bc333dee52c0c79986226 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:41:43 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of aprutil is used --- 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 +- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 30295bb4498..38fa395eee1 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildPhase = '' 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.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 848bb12b0a6..0ce0130c90a 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; configureFlags = '' --with-apr=${apr.dev} - --with-apr-util=${aprutil} + --with-apr-util=${aprutil.dev} --with-z=${zlib} --with-pcre=${pcre} --disable-maintainer-mode diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 993ddf0920b..888efc006d0 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.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" ''; }; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 3e880391fc3..95d3f8ce396 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-pcre=${pcre}" "--with-apr=${apr.dev}" - "--with-apu=${aprutil}/bin/apu-1-config" + "--with-apu=${aprutil.dev}/bin/apu-1-config" "--with-libxml=${libxml2}" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3af4a11448a..020ff87d360 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.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 = '' # override broken prereq check substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\"" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0b83883029..a3d4856034b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18659,7 +18659,7 @@ in modules // { ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); # 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 = '' cd Source