From a438f8196459a127b5633851b57c63c219ab2c13 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 9 Feb 2022 17:12:04 +0300
Subject: fix(3p/josh): Add git to josh-proxy PATH

josh-proxy calls git at runtime and needs to have it available

Change-Id: Ifccc6879cc5911060c7e6681c202fe5e8c2f5440
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5269
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: grfn <grfn@gws.fyi>
---
 third_party/josh/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'third_party/josh')

diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix
index 70786a2648cf..c82f91f80c94 100644
--- a/third_party/josh/default.nix
+++ b/third_party/josh/default.nix
@@ -29,5 +29,10 @@ depot.third_party.naersk.buildPackage {
 
   overrideMain = x: {
     patches = [ ./0001-josh-proxy-Always-require-authentication-when-pushin.patch ];
+
+    nativeBuildInputs = (x.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      wrapProgram $out/bin/josh-proxy --prefix PATH : "${pkgs.git}/bin"
+    '';
   };
 }
-- 
cgit 1.4.1