Skip to content

Commit

Permalink
magit-todos: fix build by providing git as input. (#45999)
Browse files Browse the repository at this point in the history
magit-todos requires git during builds. Fixes #45868.

(cherry picked from commit 9d6ff38)
  • Loading branch information
danieldk authored and xeji committed Sep 3, 2018
1 parent f391f6f commit d0182e0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-todos = super.magit-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

# missing OCaml
merlin = markBroken super.merlin;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-todos = super.magit-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

# missing OCaml
merlin = markBroken super.merlin;

Expand Down

0 comments on commit d0182e0

Please sign in to comment.