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

apache-httpd: enable brotli support

Browse Source
This commit is contained in:
Eli Flanagan 2018-01-05 14:53:32 -05:00 committed by Robin Gloster
parent 08cde7d69f
commit f95d92ee96
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -4,6 +4,7 @@
, http2Support ? true, nghttp2 , http2Support ? true, nghttp2
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
, libxml2Support ? true, libxml2 , libxml2Support ? true, libxml2
, brotliSupport ? true, brotli ? null
, luaSupport ? false, lua5 , luaSupport ? false, lua5
}: }:
@ -11,6 +12,7 @@ let optional = stdenv.lib.optional;
optionalString = stdenv.lib.optionalString; optionalString = stdenv.lib.optionalString;
in in
assert brotliSupport -> brotli != null;
assert sslSupport -> aprutil.sslSupport && openssl != null; assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null; assert http2Support -> nghttp2 != null;
@ -29,6 +31,7 @@ stdenv.mkDerivation rec {
setOutputFlags = false; # it would move $out/modules, etc. setOutputFlags = false; # it would move $out/modules, etc.
buildInputs = [perl] ++ buildInputs = [perl] ++
optional brotliSupport brotli ++
optional sslSupport openssl ++ optional sslSupport openssl ++
optional ldapSupport openldap ++ # there is no --with-ldap flag optional ldapSupport openldap ++ # there is no --with-ldap flag
optional libxml2Support libxml2 ++ optional libxml2Support libxml2 ++
@ -58,6 +61,7 @@ stdenv.mkDerivation rec {
--enable-cern-meta --enable-cern-meta
--enable-imagemap --enable-imagemap
--enable-cgi --enable-cgi
${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"}
${optionalString proxySupport "--enable-proxy"} ${optionalString proxySupport "--enable-proxy"}
${optionalString sslSupport "--enable-ssl"} ${optionalString sslSupport "--enable-ssl"}
${optionalString http2Support "--enable-http2 --with-nghttp2"} ${optionalString http2Support "--enable-http2 --with-nghttp2"}