summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-09-22 17:31:22 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-09-22 17:34:24 -0400
commit067b4dbb931bec94976a7660353ce8617d558b29 (patch)
tree588ebf0b722aa405a1997f87b33016a7cfde76db /pkgs
parent696b36f92851cda13da47df030bb2fbc65a52f8d (diff)
downloadnixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar.gz
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar.bz2
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar.lz
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar.xz
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.tar.zst
nixpkgs-067b4dbb931bec94976a7660353ce8617d558b29.zip
mariadb: add patch for missing libcrypt on darwin
Really fixes #69034
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/sql/mariadb/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 15553055457..b0fdd333238 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -3,7 +3,7 @@
 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
-, less
+, less, fetchpatch
 , withoutClient ? false
 }:
 
@@ -56,7 +56,12 @@ common = rec { # attributes common to both builds
   patches = [
     ./cmake-includedir.patch
     ./cmake-libmariadb-includedir.patch
-  ];
+  ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
+    url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
+    extraPrefix = "libmariadb/";
+    sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
+    stripLen = 1;
+  });
 
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"