configuration.nix

@@ -179,6 +179,8 @@ with pkgs;
     ./modules/monitoring.nix
     ./overlays/nix-direnv.nix
     ./overlays/openconnect-sso.nix
+    ./overlays/cyrus-sasl-oauth2.nix
+    ./overlays/isync-oauth2.nix
     ./overlays/emacs-vterm.nix
   ];
 

flake.lock

@@ -101,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691897365,
-        "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
+        "lastModified": 1688874465,
+        "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f4d70d098f066a30c7087144063dca179495f7d6",
+        "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692084312,
-        "narHash": "sha256-Za++qKVK6ovjNL9poQZtLKRM/re663pxzbJ+9M4Pgwg=",
+        "lastModified": 1691368598,
+        "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8353344d3236d3fda429bb471c1ee008857d3b7c",
+        "rev": "5a8e9243812ba528000995b294292d3b5e120947",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     "openconnect-sso": {
       "flake": false,
       "locked": {
-        "lastModified": 1689349020,
-        "narHash": "sha256-2UVtOb0gD6wqEY/BeLZ2BCrR/qyb6M0mgf8CRNxflPA=",
+        "lastModified": 1684767793,
+        "narHash": "sha256-ZeF4n3M066SiMuoCmBTgbMVvWEWLJq4UwXjaS45eNiU=",
         "owner": "vlaci",
         "repo": "openconnect-sso",
-        "rev": "51e1eb727a93cf8b063157b7e9453dd21d3ba85f",
+        "rev": "54263c09110125e6b78f2f46ea2ab32c6fbd49f8",
         "type": "github"
       },
       "original": {

modules/periodic.nix

@@ -2,9 +2,7 @@
 
 with pkgs;
 
-let isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
-
-in {
+{
   # Upgrade Doom Emacs daily
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";

modules/software.nix

@@ -73,7 +73,7 @@ in {
     pdfgrep
     # Mail stack
     mu
-    (isync.override { withCyrusSaslXoauth2 = true; })
+    isync-oauth2
     msmtp
     # Media
     gimp

overlays/cyrus-sasl-oauth2.nix

@@ -0,0 +1,24 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  cyrus-sasl-xoauth2 = with pkgs;
+    stdenv.mkDerivation {
+      name = "cyrus-sasl-xoauth2";
+      src = inputs.cyrus-sasl-xoauth2;
+      nativeBuildInputs =
+        [ autoreconfHook inputs.nixpkgs.legacyPackages."${system}".cyrus_sasl ];
+    };
+
+in {
+  nixpkgs.overlays = [
+    (final: prev: {
+      patched-cyrus-sasl-oauth2 = prev.cyrus_sasl.overrideAttrs (div: rec {
+        postInstall = ''
+          for lib in ${cyrus-sasl-xoauth2}/lib/sasl2/*; do
+            ln -sf $lib $out/lib/sasl2/
+          done
+        '';
+      });
+    })
+  ];
+}

overlays/isync-oauth2.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+
+{
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      isync-oauth2 = isync.overrideAttrs (div: rec {
+        buildInputs = [ openssl db patched-cyrus-sasl-oauth2 zlib ];
+      });
+    })
+  ];
+}