diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ddb1ec443a06..a2e039bd399f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv , proxySupport ? true , sslSupport ? true, openssl +, http2Support ? true, libnghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 @@ -12,6 +13,7 @@ in assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; +assert http2Support -> libnghttp2 != null; stdenv.mkDerivation rec { version = "2.4.18"; @@ -25,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2 ++ + optional http2Support libnghttp2 ++ optional stdenv.isDarwin libiconv; # Required for ‘pthread_cancel’. @@ -44,6 +47,7 @@ stdenv.mkDerivation rec { --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} + ${optionalString http2Support "--enable-http2 --with-nghttp2=${libnghttp2}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2bb982625c3..c95d9d458680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9461,7 +9461,8 @@ let }; apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { - sslSupport = true; + # 1.0.2+ for ALPN support + openssl = openssl_1_0_2; }); apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {