diff options
| author | Vladyslav M <dywedir@gra.red> | 2019-03-29 16:32:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 16:32:07 +0200 |
| commit | 60ec578e6a1ecc0af9e66837d9af975f4c40dedc (patch) | |
| tree | d2231c4269fd4b4f4dc911f29269d56512f59721 /pkgs/applications/editors/emacs/default.nix | |
| parent | 382333b25e0d6fbac746d91224ed6b805b6407a0 (diff) | |
| parent | 4952378a8749aabf75c33e73f31b6e93fbf2656d (diff) | |
| download | nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar.gz nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar.bz2 nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar.lz nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar.xz nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.tar.zst nixlib-60ec578e6a1ecc0af9e66837d9af975f4c40dedc.zip | |
Merge pull request #57237 from vlaci/pkgs/emacs
emacs: backport hunspell 1.7.0 support from upstream
Diffstat (limited to 'pkgs/applications/editors/emacs/default.nix')
| -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 12d4c24ea4bd..fe77ffe84bb1 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 '' |