diff options
Diffstat (limited to 'pkgs/servers/http/apache-httpd/2.4.nix')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 2ec30cbf0a7..788eb812272 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -9,35 +9,28 @@ , luaSupport ? false, lua5 }: -let inherit (lib) optional; -in - -assert sslSupport -> aprutil.sslSupport && openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert http2Support -> nghttp2 != null; - stdenv.mkDerivation rec { - version = "2.4.49"; pname = "apache-httpd"; + version = "2.4.50"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5"; + sha256 = "6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f"; }; # FIXME: -dev depends on -doc outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. - buildInputs = [perl] ++ - optional brotliSupport brotli ++ - optional sslSupport openssl ++ - optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2 ++ - optional http2Support nghttp2 ++ - optional stdenv.isDarwin libiconv; + buildInputs = [ perl ] ++ + lib.optional brotliSupport brotli ++ + lib.optional sslSupport openssl ++ + lib.optional ldapSupport openldap ++ # there is no --with-ldap flag + lib.optional libxml2Support libxml2 ++ + lib.optional http2Support nghttp2 ++ + lib.optional stdenv.isDarwin libiconv; - prePatch = '' + postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' ''; @@ -93,9 +86,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = "http://httpd.apache.org/"; + homepage = "https://httpd.apache.org/"; license = licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; }; } |