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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-04-16 19:40:54 +03:00
committed by Vladimír Čunát
parent 4e6b45d0a0
commit 16cc4ac83b
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc";
};
configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}";
configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}";
sourceRoot = "${name}-src/native";

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}/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}/include/apr-1 -I${pkgs.yajl}/include"
'';
};