BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apacheHttpd: add option to build experimental mod_tls

Browse source 
https://httpd.apache.org/docs/2.4/mod/mod_tls.html

Note: the attribute has been named `modTlsSupport` instead of
`tlsSupport` to try to limit the confusion with the existing
`sslSupport` attribute.
This commit is contained in:
Thomas Gerbet 2023-01-28 15:36:38 +01:00
parent f757e6cc0a
commit ce5b2e3773
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/rustls-ffi/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, apacheHttpd }:
rustPlatform.buildRustPackage rec {
pname = "rustls-ffi";
@ -26,6 +26,10 @@ rustPlatform.buildRustPackage rec {
runHook postInstall
'';
passthru.tests = {
apacheHttpd = apacheHttpd.override { modTlsSupport = true; };
};
meta = with lib; {
description = "C-to-rustls bindings";
homepage = "https://github.com/rustls/rustls-ffi/";

4
pkgs/servers/http/apache-httpd/2.4.nix
View file

@ -2,6 +2,7 @@
, nixosTests
, proxySupport ? true
, sslSupport ? true, openssl
, modTlsSupport ? false, rustls-ffi, Foundation
, http2Support ? true, nghttp2
, ldapSupport ? true, openldap
, libxml2Support ? true, libxml2
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
buildInputs = [ perl libxcrypt ] ++
lib.optional brotliSupport brotli ++
lib.optional sslSupport openssl ++
lib.optional modTlsSupport rustls-ffi ++
lib.optional (modTlsSupport && stdenv.isDarwin) Foundation ++
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
lib.optional libxml2Support libxml2 ++
lib.optional http2Support nghttp2 ++
@ -55,6 +58,7 @@ 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"

4
pkgs/top-level/all-packages.nix
View file

@ -24544,7 +24544,9 @@ with pkgs;
apache-directory-server = callPackage ../servers/ldap/apache-directory-server { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
apacheHttpd = apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {