From 7350dd9d944c91e34c20997e592671711254e618 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 13 Sep 2019 13:38:24 +0200 Subject: [PATCH] rspamd: disable LuaJIT support on aarch64 When compiled with LuaJIT support, rspamd segfaults on aarch64. Without LuaJIT, rspamd falls back to plain Lua and torch support needs to be disabled. --- pkgs/servers/mail/rspamd/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2b3986c412d0..0823ed2fe4b8 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchFromGitHub, cmake, perl , file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu -, hyperscan, libfann, gd, jemalloc, openblas +, hyperscan, libfann, gd, jemalloc, openblas, lua , withFann ? true , withGd ? false , withBlas ? true , withHyperscan ? stdenv.isx86_64 +, withLuaJIT ? stdenv.isx86_64 }: assert withHyperscan -> stdenv.isx86_64; @@ -24,11 +25,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ] + buildInputs = [ glib libevent libmagic openssl pcre sqlite ragel icu jemalloc ] ++ lib.optional withFann libfann ++ lib.optional withGd gd ++ lib.optional withHyperscan hyperscan - ++ lib.optional withBlas openblas; + ++ lib.optional withBlas openblas + ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DDEBIAN_BUILD=ON" @@ -39,10 +41,11 @@ stdenv.mkDerivation rec { "-DENABLE_JEMALLOC=ON" ] ++ lib.optional withFann "-DENABLE_FANN=ON" ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON" - ++ lib.optional withGd "-DENABLE_GD=ON"; + ++ lib.optional withGd "-DENABLE_GD=ON" + ++ lib.optional (!withLuaJIT) "-DENABLE_TORCH=OFF"; meta = with stdenv.lib; { - homepage = https://rspamd.com; + homepage = "https://rspamd.com"; license = licenses.asl20; description = "Advanced spam filtering system"; maintainers = with maintainers; [ avnik fpletz globin ];