diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/servers/mail/postfix/default.nix | |
parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
download | nixpkgs-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/postfix/default.nix')
-rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index b299d212a18..39845f12f03 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -3,7 +3,7 @@ , buildPackages , withLDAP ? true, openldap , withPgSQL ? false, postgresql -, withMySQL ? false, libmysqlclient +, withMySQL ? false, mysql , withSQLite ? false, sqlite }: @@ -12,7 +12,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); auxlibs = lib.concatStringsSep " " ([ @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper m4 ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysqlclient + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; |