diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:52:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:52:04 +0200 |
| commit | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (patch) | |
| tree | aaca4dc14216c2ba38374a2568045213407ac329 /pkgs/applications/networking/msmtp/default.nix | |
| parent | cff0669a4884bd6d0af19964c3589d13b2ea7a2b (diff) | |
| parent | e7460e94124757249515c68a36a7ffdc57a8464d (diff) | |
| download | nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.gz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.bz2 nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.lz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.xz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.zst nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/msmtp/default.nix')
| -rw-r--r-- | pkgs/applications/networking/msmtp/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index f78b085b6c64..0117ab978cc0 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -16,8 +16,13 @@ in stdenv.mkDerivation rec { sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc"; }; + # the 2nd patch should go when 1.8.9 is released patches = [ ./paths.patch + (fetchpatch { + url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch"; + sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx"; + }) ]; buildInputs = [ gnutls gsasl libidn2 ] |