diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 492745a47fdb..5a2a1a0e8ac8 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -37,6 +37,7 @@ with lib;
       imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
       libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = 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; };
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;