From d0182e091794a8d5475a090e8cc8a00b1a134586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 3 Sep 2018 23:42:57 +0200 Subject: [PATCH] magit-todos: fix build by providing git as input. (#45999) magit-todos requires git during builds. Fixes #45868. (cherry picked from commit 9d6ff38f706c29cd376a52323c8f8018ac93aca6) --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ .../editors/emacs-modes/melpa-stable-packages.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index bec845b815ce7..addae2674684b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -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; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 61086b96230e3..98927cbd98735 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -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;