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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-05-19 10:00:25 +02:00
committed by Vladimír Čunát
parent 29694b43b6
commit d298b52fd3
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+1 -1
View File
@@ -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
pkgs/servers/http/nginx/modules.nix
+1 -1
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.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"
'';
};