public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50927 from Ma27/fix-smime-for-mutt-and-neomutt

Browse Source 
mutt/neomutt: work around S/MIME issues with `application/pgp-encrypted`
This commit is contained in:
Renaud 2018-11-27 23:18:29 +01:00 committed by GitHub
commit 483914b30c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
}; };
patches = optional smimeSupport (fetchpatch { patches = optional smimeSupport (fetchpatch {
url = "https://sources.debian.net/src/mutt/1.7.2-1/debian/patches/misc/smime.rc.patch"; url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; sha256 = "1rl27qqwl4nw321ll5jcvfmkmz4fkvcsh5vihjcrhzzyf6vz8wmj";
}); });
buildInputs = buildInputs =

8
pkgs/applications/networking/mailreaders/neomutt/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap
}:
let let
muttWrapper = writeScript "mutt" '' muttWrapper = writeScript "mutt" ''
@ -28,7 +29,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb notmuch openssl perl lmdb
mime-types mailcap
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,10 +48,11 @@ in stdenv.mkDerivation rec {
--replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
done done
# allow neomutt to map attachments to their proper mime.types if specified wrongly # allow neomutt to map attachments to their proper mime.types if specified wrongly
# and use a far more comprehensive list than the one shipped with neomutt # and use a far more comprehensive list than the one shipped with neomutt
substituteInPlace sendlib.c \ substituteInPlace sendlib.c \
--replace /etc/mime.types ${mime-types}/etc/mime.types --replace /etc/mime.types ${mailcap}/etc/mime.types
# The string conversion tests all fail with the first version of neomutt # The string conversion tests all fail with the first version of neomutt
# that has tests (20180223) as well as 20180716 so we disable them for now. # that has tests (20180223) as well as 20180716 so we disable them for now.