From 31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Jun 2015 23:47:08 -0700 Subject: [PATCH] mariadb: Fix for darwin --- pkgs/servers/sql/mariadb/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 21ccd50e3ef..ab93c3499dc 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -49,9 +49,10 @@ stdenv.mkDerivation rec { "-DWITH_PARTITION_STORAGE_ENGINE=1" "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" - ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" + "-DWITHOUT_TOKUDB=1" + ]; enableParallelBuilding = true;