diff options
| author | Léo Gaspard <leo@gaspard.io> | 2018-06-17 22:28:23 +0200 |
|---|---|---|
| committer | Léo Gaspard <leo@gaspard.io> | 2018-06-18 17:51:21 +0200 |
| commit | c068e1ca9af3e86f56615aafd705fbd851f466bb (patch) | |
| tree | aafb805711a5b8721c3e48682e20997b15613d61 /pkgs/servers/mail/opensmtpd | |
| parent | 4b649a99d8461c980e7028a693387dc48033c1f7 (diff) | |
| download | nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar.gz nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar.bz2 nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar.lz nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar.xz nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.tar.zst nixpkgs-c068e1ca9af3e86f56615aafd705fbd851f466bb.zip | |
opensmtpd: fix interaction with dovecot-2.3.1
This has been merged upstream with
https://github.com/OpenSMTPD/OpenSMTPD/pull/847
Diffstat (limited to 'pkgs/servers/mail/opensmtpd')
| -rw-r--r-- | pkgs/servers/mail/opensmtpd/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index e562fdc88a6..60c517230b4 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison +{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison , libasr, libevent, zlib, openssl, db, pam # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it @@ -23,7 +23,13 @@ else stdenv.mkDerivation rec { sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; }; - patches = [ ./proc_path.diff ]; + patches = [ + ./proc_path.diff + (fetchpatch { + url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; + sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; + }) + ]; postPatch = with builtins; with lib; optionalString unpriviledged_smtpctl_encrypt '' |