diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-16 22:34:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 22:34:45 +0000 |
| commit | f38dad3581a435c14f0158aa79da1e105685a470 (patch) | |
| tree | be8a49cdcc865143b626ead4320c76ed8377306f | |
| parent | b33af2f7bb26abdbea7b6d48aebcb89d1bce754e (diff) | |
| parent | 3d52d43dd983a2e0d966cb55b84d6dd66a16bf12 (diff) | |
| download | nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar.gz nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar.bz2 nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar.lz nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar.xz nixlib-f38dad3581a435c14f0158aa79da1e105685a470.tar.zst nixlib-f38dad3581a435c14f0158aa79da1e105685a470.zip | |
Merge pull request #32736 from themoritz/emacs-vfork
pkgs.emacs25: backport patch to fix vfork issue
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index af3298a5883e..f87cc72f2f2b 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -36,9 +36,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = - [ ./clean-env.patch ] - ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch; + patches = [ + ./clean-env.patch + ] ++ lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + + # Backport of the fix to + # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html + # Should be removed when switching to Emacs 26.1 + (fetchurl { + url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; + sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; + }) + ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] |