From 71e3992d77c11199cd388c27b0806be93cbedd88 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sun, 10 Nov 2024 18:13:19 -0800 Subject: [PATCH] mariadb: use fmt_11 for 10.11 & greater https://github.com/MariaDB/server/blob/mariadb-10.11.10/cmake/libfmt.cmake uses fmt 11.0.2 --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 76ce8d6b6dc9..a178e1fa28e4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -14,7 +14,7 @@ let , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl - , fmt_8 + , fmt_11 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true , withEmbedded ? false @@ -149,7 +149,7 @@ let ]; buildInputs = common.buildInputs - ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; + ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ]; cmakeFlags = common.cmakeFlags ++ [ "-DPLUGIN_AUTH_PAM=NO" @@ -179,7 +179,7 @@ let ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] - ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; + ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ]; propagatedBuildInputs = lib.optional withNuma numactl;