From 7eefdd54ad5b58e27581c06cdfc8f68d0505f9dc Mon Sep 17 00:00:00 2001 From: Vika Shleina Date: Wed, 24 Nov 2021 02:07:30 +0300 Subject: [PATCH] mariadb: fix build on non-x86_64 linux pmdk is only available on x86_64-linux, yet included in other platforms. Things tested: - build on x86_64-linux is the same (substituted from binary cache) - build on aarch64-linux doesn't crash now with an "unsupported system" (cherry picked from commit ccb2baa61514310f5b6948d125a2596a35f51f69) --- pkgs/servers/sql/mariadb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 41b7bc383b60..82fdc2a3a38b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -164,7 +164,8 @@ server = stdenv.mkDerivation (common // { bzip2 lz4 lzo snappy xz zstd cracklib judy libevent libxml2 ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals stdenv.hostPlatform.isLinux [ linux-pam pmdk.dev ] + ++ optionals stdenv.hostPlatform.isLinux [ linux-pam ] + ++ optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ];