emacsPackagesNg.magit: find Git during build

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -124,11 +124,16 @@ 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
-      magit = super.magit.override {
           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;

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;
 

pkgs/top-level/all-packages.nix

@@ -15905,7 +15905,8 @@ with pkgs;
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
-      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
+      inherit
+        autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib;
     };
   };
 

pkgs/top-level/emacs-packages.nix

@@ -50,7 +50,7 @@ let
   };
 
   melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
-    inherit lib;
+    inherit external lib;
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {