about summary refs log tree commit diff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-06-18 23:47:08 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-06-18 23:47:08 -0700
commit31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0 (patch)
tree7e612a7f92777c6f5ff6690f07a95e5f05b86d20 /pkgs/servers/sql
parent91e87c5f58bae963807745c56247f6a6b6fcab7d (diff)
downloadnixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar.gz
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar.bz2
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar.lz
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar.xz
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.tar.zst
nixlib-31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0.zip
mariadb: Fix for darwin
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/mariadb/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 21ccd50e3ef5..ab93c3499dc3 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;