diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 2d9ac45b8e82..304ff008348b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -2,7 +2,6 @@ , nixosTests , proxySupport ? true , sslSupport ? true, openssl -, modTlsSupport ? false, rustls-ffi, Foundation , http2Support ? true, nghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 @@ -40,8 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ perl libxcrypt zlib ] ++ lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ - lib.optional modTlsSupport rustls-ffi ++ - lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++ lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional libxml2Support libxml2 ++ lib.optional http2Support nghttp2 ++ @@ -70,7 +67,6 @@ stdenv.mkDerivation rec { "--includedir=${placeholder "dev"}/include" (lib.enableFeature proxySupport "proxy") (lib.enableFeature sslSupport "ssl") - (lib.enableFeature modTlsSupport "tls") (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") "--docdir=$(doc)/share/doc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6d18c1a3849..f4a844762ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11518,9 +11518,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {