From 5e193cdcab61b5e7096ef3c132fdc0149e14f2d9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 31 Mar 2025 23:28:55 -0500
Subject: [PATCH] msmtp: fix missing inherits (#6741)

---
 modules/programs/msmtp.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix
index c9d195a7..98b60e80 100644
--- a/modules/programs/msmtp.nix
+++ b/modules/programs/msmtp.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkOption optionalAttrs types;
 
   cfg = config.programs.msmtp;
 
@@ -11,8 +11,8 @@ let
 
   accountStr = account:
     with account;
-    concatStringsSep "\n" ([ "account ${name}" ]
-      ++ mapAttrsToList (n: v: n + " " + v) ({
+    lib.concatStringsSep "\n" ([ "account ${name}" ]
+      ++ lib.mapAttrsToList (n: v: n + " " + v) ({
         host = smtp.host;
         from = address;
         auth = "on";
@@ -26,8 +26,8 @@ let
           tls_trust_file = smtp.tls.certificatesFile;
         } // optionalAttrs (passwordCommand != null) {
           passwordeval = toString passwordCommand;
-        } // msmtp.extraConfig) ++ optional primary "account default : ${name}"
-      ++ map (alias: ''
+        } // msmtp.extraConfig)
+      ++ lib.optional primary "account default : ${name}" ++ map (alias: ''
 
         account ${alias} : ${name}
         from ${alias}