From 437468d5ea0d66d4400b178883389be4adabd3da Mon Sep 17 00:00:00 2001 From: michael bishop Date: Sun, 17 Apr 2016 00:40:10 -0300 Subject: [PATCH] mariadb: fix arm builds --- 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 6091703c52cd..642fb59a7469 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { # temporary due to https://mariadb.atlassian.net/browse/MDEV-9000 (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib - ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] + ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ] + ++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;