diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
commit | fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch) | |
tree | dba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /pkgs/servers/mail/exim/default.nix | |
parent | 15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff) | |
parent | 217cf982c754f1e8506e180551c73f57c04aed7f (diff) | |
download | nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2 nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip |
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the previously reverted staging-next merge.
Diffstat (limited to 'pkgs/servers/mail/exim/default.nix')
-rw-r--r-- | pkgs/servers/mail/exim/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index fcafd5817d4..96c8ad4a383 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,6 +1,6 @@ { coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv , enableLDAP ? false, openldap -, enableMySQL ? false, mysql, zlib +, enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] + ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam ++ stdenv.lib.optional enableSPF libspf2; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - 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/: + s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: |