diff options
| author | László Vaskó <laszlo.vasko@outlook.com> | 2019-03-10 11:33:01 +0100 |
|---|---|---|
| committer | László Vaskó <vlaci@balabit.hu> | 2019-03-10 15:39:29 +0100 |
| commit | 4952378a8749aabf75c33e73f31b6e93fbf2656d (patch) | |
| tree | cbd7042e7cb01676fbc7858407682cd0f88e58b8 /pkgs/applications/editors/emacs | |
| parent | e39935ce1a6448d009ef4e3fb00e28b883856ee0 (diff) | |
| download | nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar.gz nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar.bz2 nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar.lz nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar.xz nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.tar.zst nixlib-4952378a8749aabf75c33e73f31b6e93fbf2656d.zip | |
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.
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
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 '' |