diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-08-05 16:21:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 16:21:20 -0400 |
| commit | bd5a8797cc77628aa8ae6af49454c01558d535d2 (patch) | |
| tree | fd9292e31424d06bce5c4f132a25ac6f3add7428 /pkgs/servers | |
| parent | 838bb4c56b07bb0d5e7b370098d4c8f7508d24ba (diff) | |
| parent | d35441699ea6d76c2420b73356303f3a934506df (diff) | |
Merge pull request #62888 from ajs124/exim_mysql_fix
exim: Fix build with MariaDB
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/exim/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 88c973de0d1b..a537a4c6d00c 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ mysql zlib ] + ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam; preBuild = '' - ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"} sed ' s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin: s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf: @@ -52,10 +51,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/: + s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: |