about summary refs log tree commit diff
path: root/pkgs/applications/networking/msmtp
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2018-08-21 21:36:06 +0200
committerRobert Helgesson <robert@rycee.net>2018-08-21 21:36:06 +0200
commit2bcb700b058f0e215d93541b256b447744d32fe4 (patch)
treea1d7439453ac49ebd475b2e898e5f4b60d49610a /pkgs/applications/networking/msmtp
parent28e51c7ceac1c3df219dbf8388bf122f817459b7 (diff)
msmtp: support passwordeval without final '\n'
This applies an upstream patch that removes the requirement for
passwordeval commands to print a `\n` character after the password.
Diffstat (limited to 'pkgs/applications/networking/msmtp')
-rw-r--r--pkgs/applications/networking/msmtp/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 2372685dc2788..4e2f9e636d5d9 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
+{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig
 , openssl, netcat-gnu, gnutls, gsasl, libidn, Security
 , withKeyring ? true, libsecret ? null
 , systemd ? null }:
@@ -19,6 +19,14 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./paths.patch
+
+    # To support passwordeval commands that do not print a final
+    # newline.
+    (fetchpatch {
+      name = "passwordeval-without-nl.patch";
+      url = "https://gitlab.marlam.de/marlam/msmtp/commit/df22dccf9d1af06fcd09dfdd0d6a38e1372dd5e8.patch";
+      sha256 = "06gbhvzi46zqigmmsin2aard7b9v3ihx62hbz5ljmfbj9rfs1x5y";
+    })
   ];
 
   buildInputs = [ openssl gnutls gsasl libidn ]