about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2019-10-21 08:23:01 +0800
committerGitHub <noreply@github.com>2019-10-21 08:23:01 +0800
commit803aa128b1e83d89f8fcb23e8d4a3745384ac55d (patch)
tree7b22faac089f9b27db189095519ce8317225e2d5
parentd67b8a9eb1b32d8e50ed7aef6f5062d2a104a310 (diff)
parent29f4fd41d23c4b0571818e92ed6bcda283fcb051 (diff)
downloadnixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar.gz
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar.bz2
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar.lz
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar.xz
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.tar.zst
nixlib-803aa128b1e83d89f8fcb23e8d4a3745384ac55d.zip
Merge pull request #71351 from peterhoeg/f/emacs_evil_escape
emacsPackages.evil-escape: fix build
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 838e57343c43..374dfb411e77 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -85,6 +85,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           stripDebugList = [ "share" ];
         });
 
+        # https://github.com/syl20bnr/evil-escape/pull/86
+        evil-escape = super.evil-escape.overrideAttrs (attrs: {
+          postPatch = ''
+            substituteInPlace evil-escape.el \
+              --replace ' ;;; evil' ';;; evil'
+          '';
+          packageRequires = with self; [ evil ];
+        });
+
         evil-magit = super.evil-magit.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =