rustPlatform.fetchCargoVendor: use gitMinimal; nix-prefetch-git: use normal git (#493713)

pkgs/build-support/rust/fetch-cargo-vendor.nix

@@ -5,6 +5,7 @@
   writers,
   python3Packages,
   cargo,
+  gitMinimal,
   nix-prefetch-git,
   cacert,
 }:
@@ -61,9 +62,12 @@ let
       nativeBuildInputs = [
         fetchCargoVendorUtil
         cacert
-        # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git
-        # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692
-        (nix-prefetch-git.override { git-lfs = null; })
+        (nix-prefetch-git.override {
+          git = gitMinimal;
+          # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git
+          # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692
+          git-lfs = null;
+        })
       ]
       ++ nativeBuildInputs;
 

pkgs/tools/package-management/nix-prefetch-scripts/default.nix

@@ -12,7 +12,7 @@
   findutils,
   fossil,
   gawk,
-  gitMinimal,
+  git,
   git-lfs,
   gnugrep,
   gnused,
@@ -77,7 +77,7 @@ rec {
   nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [
     findutils
     gawk
-    gitMinimal
+    git
     git-lfs
     gnused
   ];