From 86553b4f7071e1acc6370ea82069aa61afc6a1f1 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@autogeree.net>
Date: Tue, 13 Nov 2018 23:49:20 +0000
Subject: [PATCH] dovecot: add SASL fix

---
 install/overlays.nix                      | 6 ++++--
 install/overlays/servers/mail/dovecot.nix | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 install/overlays/servers/mail/dovecot.nix

diff --git a/install/overlays.nix b/install/overlays.nix
index b11f57f..9172acb 100644
--- a/install/overlays.nix
+++ b/install/overlays.nix
@@ -1,6 +1,8 @@
 map import
-[ #overlays/servers/mail/dovecot.nix
-  overlays/servers/mail/postfix.nix
+[ #overlays/servers/mail/postfix.nix
+  overlays/servers/mail/dovecot.nix
+   # TODO: remove when using a nixpkgs including the fix
+   # https://github.com/NixOS/nixpkgs/pull/46859
   overlays/lib/strings.nix
   overlays/users-init.nix
   overlays/tools/networking/shorewall-core.nix
diff --git a/install/overlays/servers/mail/dovecot.nix b/install/overlays/servers/mail/dovecot.nix
new file mode 100644
index 0000000..59c76f4
--- /dev/null
+++ b/install/overlays/servers/mail/dovecot.nix
@@ -0,0 +1,5 @@
+self: super:  {
+  dovecot = super.dovecot.overrideAttrs (old: {
+    configureFlags = (old.configureFlags or []) ++ [ "CFLAGS=-I${self.cyrus_sasl.dev}/include/sasl" ];
+  });
+}
-- 
2.47.2