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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.2.nix
+3 -3
View File
@@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = ''
--with-z=${zlib}
--with-pcre=${pcre}
--with-z=${zlib.dev}
--with-pcre=${pcre.dev}
--enable-mods-shared=all
--enable-authn-alias
${if proxySupport then "--enable-proxy" else ""}
${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""}
${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
--with-mpm=${mpm}
--enable-cache
pkgs/servers/http/apache-httpd/2.4.nix
+4 -4
View File
@@ -46,10 +46,10 @@ stdenv.mkDerivation rec {
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = ''
--with-apr=${apr}
--with-apr-util=${aprutil}
--with-z=${zlib}
--with-pcre=${pcre}
--with-apr=${apr.dev}
--with-apr-util=${aprutil.dev}
--with-z=${zlib.dev}
--with-pcre=${pcre.dev}
--disable-maintainer-mode
--disable-debugger-mode
--enable-mods-shared=all
pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+1 -1
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";
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}/include -I${pkgs.apr}/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"
'';
};