diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:41:26 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:24 +0200 |
| commit | 29694b43b6256312ab96da8c72815ddd58a10043 (patch) | |
| tree | 99d384ab1719099952643826ddd8d367ad1c8515 /pkgs/servers/http | |
| parent | 16cc4ac83bb3f72c9727d07ee29e979172fa8f71 (diff) | |
| download | nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar.gz nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar.bz2 nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar.lz nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar.xz nixlib-29694b43b6256312ab96da8c72815ddd58a10043.tar.zst nixlib-29694b43b6256312ab96da8c72815ddd58a10043.zip | |
treewide: Make explicit that 'dev' output of apr is used
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bc7fd1441c13..848bb12b0a6e 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 f667b6489e0a..993ddf0920b8 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" ''; }; |