diff options
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 33473ecad3f0..bf0d50368972 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib }: +{ lib, external }: self: @@ -132,6 +132,17 @@ self: # upstream issue: missing file header maxframe = markBroken super.maxframe; + magit = + (super.magit.override { + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + inherit (self.melpaStablePackages) magit-popup; + }).overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; |