From e0c2405594d29b3e7295e2b9a2bc9554fff8c751 Mon Sep 17 00:00:00 2001 From: Felipe Silva Date: Tue, 16 Apr 2024 20:14:18 -0300 Subject: [PATCH] isync: add default SASL mechanisms when using `cyrus-sasl-xoauth2` The XOAUTH2 support was added in 47eda8e, overriding `SASL_PATH` and dropping all default SASL mechanisms from `cyrus_sasl`. The option was disabled by default in fe02c5e, but users manually overriding isync to enable `withCyrusSaslXoauth2` still face this issue. This commit sets `SASL_PATH` to a combination of `cyrus_sasl` and `cyrus-sasl-xoauth2`, as suggested in #235959. --- pkgs/tools/networking/isync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 89b200e8e563..bfe968456a2d 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ - --prefix SASL_PATH : "${lib.makeSearchPath "lib/sasl2" [ cyrus-sasl-xoauth2 ]}" + --prefix SASL_PATH : "${lib.makeSearchPath "lib/sasl2" [ cyrus-sasl-xoauth2 cyrus_sasl.out ]}" ''; meta = with lib; {