diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index a47156ea299c..788eb812272c 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -9,13 +9,6 @@ , 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 { pname = "apache-httpd"; version = "2.4.50"; @@ -29,15 +22,15 @@ stdenv.mkDerivation rec { 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 ]; }; } diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 6439407e99b8..da0141533138 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -26,6 +26,5 @@ buildGoModule rec { homepage = "https://github.com/unifi-poller/unifi-poller"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; - platforms = platforms.unix; }; }