From 93cc05d36319418c3304115964398f17f10545ae Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 12 Jan 2020 01:20:45 +0000 Subject: [PATCH] feat(third_party/git): Add derivation to build git This overrides the upstream derivation to: * use local sources * build `git send-email` It also calls autoreconf before building because files that are included in the git distribution tarball (which the normal derivation uses) are missing from source. --- third_party/default.nix | 1 + third_party/git/.skip-subtree | 1 + third_party/git/default.nix | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 third_party/git/.skip-subtree create mode 100644 third_party/git/default.nix diff --git a/third_party/default.nix b/third_party/default.nix index 6e7bf873c..1d4a6ae7e 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.` 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 000000000..2f5f854d7 --- /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 000000000..fd847274e --- /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; +}