diff options
| author | John Wiegley <johnw@newartisans.com> | 2020-04-20 10:57:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 10:57:17 -0700 |
| commit | fd494fc013993fbcfb3015bd35b30a9c23dd85fc (patch) | |
| tree | 13cbd68b98c57f6b1593b75986719d7b774a7b2c /pkgs/applications/editors/emacs | |
| parent | 60100a7c922df1ef0fe6273af9d76721e9878805 (diff) | |
| parent | 076f221a0bce289985f8b8b08f85932aff7c44b5 (diff) | |
Merge pull request #84785 from mikesperber/unbreak-emacs-macos
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 9d0fc4565385..fc00384c03ae 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + # unbreak macOS unexec + (fetchpatch { + url = https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch; + sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; + }) ]; postPatch = lib.optionalString srcRepo '' |