about summary refs log tree commit diff
path: root/third_party/josh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-02-09T14·12+0300
committerclbot <clbot@tvl.fyi>2022-02-18T08·24+0000
commita438f8196459a127b5633851b57c63c219ab2c13 (patch)
tree3e97257b4c2d53c80fe733c07528d74a67f372c6 /third_party/josh
parent95780174e173f59b27d4f1f4e6628262f105477a (diff)
fix(3p/josh): Add git to josh-proxy PATH r/3845
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>
Diffstat (limited to 'third_party/josh')
-rw-r--r--third_party/josh/default.nix5
1 files changed, 5 insertions, 0 deletions
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"
+    '';
   };
 }