From 89ce25efe9f942e2d77d477a6a7f0c8377342bdc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 19 Sep 2022 21:59:46 +0200 Subject: [PATCH] mariadb: also use openssl_3 for 10.7 and 10.6 follow-up to 84f17a3082491d6a01baa840e3a94c5fb6128941 --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d9207fbe045f..f8a87ae81424 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -46,7 +46,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) - ++ (if (lib.versionOlder version "10.8") + ++ (if (lib.versionOlder version "10.6") then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] else [ openssl curl ]);