apache: cleanup, remove ? null, remove extra lib., remove let in, update homepage

+10 -17
+10 -17
pkgs/servers/http/apache-httpd/2.4.nix
··· 9 9 , luaSupport ? false, lua5 10 10 }: 11 11 12 - let inherit (lib) optional; 13 - in 14 - 15 - assert sslSupport -> aprutil.sslSupport && openssl != null; 16 - assert ldapSupport -> aprutil.ldapSupport && openldap != null; 17 - assert http2Support -> nghttp2 != null; 18 - 19 12 stdenv.mkDerivation rec { 20 13 pname = "apache-httpd"; 21 14 version = "2.4.50"; ··· 29 22 outputs = [ "out" "dev" "man" "doc" ]; 30 23 setOutputFlags = false; # it would move $out/modules, etc. 31 24 32 - buildInputs = [perl] ++ 33 - optional brotliSupport brotli ++ 34 - optional sslSupport openssl ++ 35 - optional ldapSupport openldap ++ # there is no --with-ldap flag 36 - optional libxml2Support libxml2 ++ 37 - optional http2Support nghttp2 ++ 38 - optional stdenv.isDarwin libiconv; 25 + buildInputs = [ perl ] ++ 26 + lib.optional brotliSupport brotli ++ 27 + lib.optional sslSupport openssl ++ 28 + lib.optional ldapSupport openldap ++ # there is no --with-ldap flag 29 + lib.optional libxml2Support libxml2 ++ 30 + lib.optional http2Support nghttp2 ++ 31 + lib.optional stdenv.isDarwin libiconv; 39 32 40 - prePatch = '' 33 + postPatch = '' 41 34 sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" 42 35 sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' 43 36 ''; ··· 93 86 94 87 meta = with lib; { 95 88 description = "Apache HTTPD, the world's most popular web server"; 96 - homepage = "http://httpd.apache.org/"; 89 + homepage = "https://httpd.apache.org/"; 97 90 license = licenses.asl20; 98 - platforms = lib.platforms.linux ++ lib.platforms.darwin; 91 + platforms = platforms.linux ++ platforms.darwin; 99 92 maintainers = with maintainers; [ lovek323 peti ]; 100 93 }; 101 94 }