From 473229889001f5ebf5dfc164ae14ffe54d3fed7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 5 Oct 2021 17:31:40 +0200
Subject: [PATCH 1/2] apache: cleanup, remove ? null, remove extra lib., remove
 let in, update homepage

---
 pkgs/servers/http/apache-httpd/2.4.nix | 27 ++++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

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 ];
   };
 }

From 4d76247ef95da191270d18ef8a34683c6826ce21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 5 Oct 2021 17:32:06 +0200
Subject: [PATCH 2/2] unify-poller: remove default platform

---
 pkgs/servers/monitoring/unifi-poller/default.nix | 1 -
 1 file changed, 1 deletion(-)

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;
   };
 }