diff options
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-packages.nix')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index c21db447e39..3d432158651 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -124,11 +124,16 @@ self: # upstream issue: missing file header maxframe = markBroken super.maxframe; - # version of magit-popup needs to match magit - # https://github.com/magit/magit/issues/3286 - magit = super.magit.override { - inherit (self.melpaPackages) magit-popup; - }; + magit = + (super.magit.override { + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + inherit (self.melpaPackages) magit-popup; + }).overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); # missing OCaml merlin = markBroken super.merlin; |