diff options
author | Thomas Gerbet <thomas@gerbet.me> | 2023-07-13 22:39:54 +0200 |
---|---|---|
committer | Thomas Gerbet <thomas@gerbet.me> | 2023-07-13 22:39:54 +0200 |
commit | abdd388fa8986f09706824882c967d7aa94b9038 (patch) | |
tree | 8dbdcb03a0c5602695dbee7bd8a1776494e57a42 /pkgs/servers/http | |
parent | 11fec97761910d059a1315dbebe4e70a711a968a (diff) |
rustls-ffi: 0.9.2 -> 0.10.0
Changelog: https://github.com/rustls/rustls-ffi/releases/tag/v0.10.0
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index eed98b2680b7f..98a00afc519d4 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which, libxcrypt +, fetchpatch , nixosTests , proxySupport ? true , sslSupport ? true, openssl @@ -35,6 +36,14 @@ stdenv.mkDerivation rec { lib.optional http2Support nghttp2 ++ lib.optional stdenv.isDarwin libiconv; + patches = lib.optionals modTlsSupport [ + (fetchpatch { + name = "compat-with-rustls-ffi-0.10.0.patch"; + url = "https://github.com/apache/httpd/commit/918620a183d843fb393ed939423a25d42c1044ec.patch"; + hash = "sha256-YZi3t++hjM0skisax2xuh9DifZVZjCjVn6XQr6QKGEs="; + }) + ]; + postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' |