diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 12:34:47 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:16:46 +0100 |
| commit | 313da176d35efefbcf36b41ec348c38403581e83 (patch) | |
| tree | cd7bba63111f2330601c18f0b2a33b65c3b9bbab /pkgs/servers/mail | |
| parent | f9f46dc327c7e659e84d558f1309e16e16e8245a (diff) | |
| download | nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.gz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.bz2 nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.lz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.xz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.zst nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.zip | |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/servers/mail')
| -rw-r--r-- | pkgs/servers/mail/opensmtpd/extras.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index f7ed6382a7b..5a5fc537d6e 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -76,11 +76,10 @@ stdenv.mkDerivation rec { "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = - stdenv.lib.optional enableRedis + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - ++ stdenv.lib.optional enableMysql - "-L${libmysqlclient}/lib/mysql"; + + stdenv.lib.optionalString enableMysql + " -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index b3345f9420c..c0e6252a551 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; - NIX_LDFLAGS = lib.optional withLDAP "-llber"; + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; installTargets = [ "non-interactive-package" ]; |