From 4952378a8749aabf75c33e73f31b6e93fbf2656d Mon Sep 17 00:00:00 2001 From: László Vaskó Date: Sun, 10 Mar 2019 11:33:01 +0100 Subject: emacs: backport hunspell 1.7.0 support from upstream NixOS 19.03 has hunspell 1.7.0 which is incompatible with emacs 26.1. This issue has been fixed in upstream and we should drop this patch after emacs is updated too. --- pkgs/applications/editors/emacs/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors/emacs/default.nix') diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2f7a4233656c..a559a0b201bc 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +{ stdenv, lib, fetchpatch, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + + # should drop this at next package update + (fetchpatch { + name = "support-hunspell-1.7.0-in-ispell.el.patch"; + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584"; + sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11"; + }) ]; postPatch = lib.optionalString srcRepo '' -- cgit 1.4.1