summary refs log tree commit diff
path: root/pkgs/servers/mail/opensmtpd
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
commitf8a8fc6c7c079de430fa528f688ddac781bcef16 (patch)
tree08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/servers/mail/opensmtpd
parent6be720b3a756662bb31adfdc1948553a02057c16 (diff)
downloadnixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing
changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1.

Let's delay this.  We have some serious regressions.
Diffstat (limited to 'pkgs/servers/mail/opensmtpd')
-rw-r--r--pkgs/servers/mail/opensmtpd/extras.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index f7ed6382a7b..71b27facbab 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, libevent, libasr,
-  python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
+  python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
   enablePython ? true,
   enableLua ? true,
   enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
+    libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional enableRedis
       "-I${hiredis}/include/hiredis -lhiredis"
     ++ stdenv.lib.optional enableMysql
-      "-L${libmysqlclient}/lib/mysql";
+      "-L${mysql.connector-c}/lib/mysql";
 
   meta = with stdenv.lib; {
     homepage = https://www.opensmtpd.org/;