3 files changed, 18 insertions, 0 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 6e7bf873c603..1d4a6ae7e19a 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -20,6 +20,7 @@ let
     # of the repo. They become available under `pkgs.third_party.<name>`
     inherit (nixpkgs)
       age
+      autoconf
       bashInteractive
       bat
       buildGoPackage
diff --git a/third_party/git/.skip-subtree b/third_party/git/.skip-subtree
new file mode 100644
index 000000000000..2f5f854d72b6
--- /dev/null
+++ b/third_party/git/.skip-subtree
@@ -0,0 +1 @@
+Subtrees of this directory belong to git (third-party).
diff --git a/third_party/git/default.nix b/third_party/git/default.nix
new file mode 100644
index 000000000000..fd847274e129
--- /dev/null
+++ b/third_party/git/default.nix
@@ -0,0 +1,16 @@
+# Use the upstream git derivation (there's a lot of stuff happening in
+# there!) and just override the source:
+{ pkgs, ... }:
+
+with pkgs.third_party;
+
+(originals.git.overrideAttrs(_: {
+  version = "2.23.0";
+  src = ./.;
+  doInstallCheck = false;
+  preConfigure = ''
+    ${autoconf}/bin/autoreconf -i
+  '';
+})).override {
+  sendEmailSupport = true;
+}