From 4e0307dcfc4674f733bbb3e93dbe15ae910258e2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:48:19 +0300 Subject: treewide: Make explicit that 'dev' output of cyrus_sasl is used --- pkgs/servers/mail/postfix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 75685d7605e2..d75e2e059353 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -7,7 +7,7 @@ let ccargs = lib.concatStringsSep " " ([ - "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl" + "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" "-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" -- cgit 1.4.1 From 674eb400ef4049ac0d4dd53b541936f5d3b06962 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:35:59 +0300 Subject: treewide: Make explicit that 'dev' output of libevent is used --- pkgs/applications/networking/cluster/mesos/default.nix | 2 +- pkgs/development/libraries/coprthr/default.nix | 2 +- pkgs/servers/mail/opensmtpd/extras.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index bc6367a80551..6d6040aba8ba 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { "--enable-ssl" "--with-ssl=${openssl}" "--enable-libevent" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" ]; diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 40be21131d20..5630daa0d933 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libelf=${libelf}" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" "--with-libconfig=${libconfig}" "--with-opencl-icd-path=$out/etc/OpenCL/vendors" "--enable-user-install" diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 0123d19bf3fa..cf93b11ba9aa 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-privsep-user=smtpd" - "--with-libevent-dir=${libevent}" + "--with-libevent-dir=${libevent.dev}" "--with-filter-clamav" "--with-filter-dkim-signer" -- cgit 1.4.1