diff options
| author | Mike Sperber <sperber@deinprogramm.de> | 2020-04-09 10:17:38 +0200 |
|---|---|---|
| committer | Mike Sperber <sperber@deinprogramm.de> | 2020-04-09 10:17:38 +0200 |
| commit | 076f221a0bce289985f8b8b08f85932aff7c44b5 (patch) | |
| tree | 0c592d1c1c017b670ab1b64c4fa567b616238952 /pkgs/applications/editors/emacs/default.nix | |
| parent | b955b22b2222fedc9133b992ce4f70863e1edebf (diff) | |
| download | nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar.gz nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar.bz2 nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar.lz nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar.xz nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.tar.zst nixlib-076f221a0bce289985f8b8b08f85932aff7c44b5.zip | |
emacs: Unbreak on macOS
Backport an unexec fix.
Diffstat (limited to 'pkgs/applications/editors/emacs/default.nix')
| -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 2b40eb77e2cf..ecf1e8d16485 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 '' |