From debcf570c6a94fb6b6ff60e5f9ae8d90aec35ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Dec 2022 20:10:13 +0100
Subject: [PATCH 1/2] nixos/no-x-libs: add msmtp

---
 nixos/modules/config/no-x-libs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index e5699161ec4b..3a0c2304cbd5 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -36,6 +36,7 @@ with lib;
       imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
       imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
       libva = super.libva-minimal;
+      msmtp = super.msmtp.override { withKeyring = false; };
       networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
       networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };

From da75629e3451171653ff57de7125d82c42cf8a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Dec 2022 20:12:07 +0100
Subject: [PATCH 2/2] msmtp: little cleanups

---
 pkgs/applications/networking/msmtp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 8006d81c9298..df5c1354562c 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -16,9 +16,9 @@
 , which
 , Security
 , withKeyring ? true
-, libsecret ? null
+, libsecret
 , withSystemd ? stdenv.isLinux
-, systemd ? null
+, systemd
 }:
 
 let
@@ -41,7 +41,7 @@ let
     platforms = platforms.unix;
   };
 
-  binaries = stdenv.mkDerivation rec {
+  binaries = stdenv.mkDerivation {
     pname = "msmtp-binaries";
     inherit version src meta;
 
@@ -62,7 +62,7 @@ let
     '';
   };
 
-  scripts = resholve.mkDerivation rec {
+  scripts = resholve.mkDerivation {
     pname = "msmtp-scripts";
     inherit version src meta;