Skip to content

Commit

Permalink
gitaly: Embed git binaries
Browse files Browse the repository at this point in the history
gitaly now embeds git binaries in itself during the build

https://gitlab.com/gitlab-org/gitaly/-/blob/10fd91391a7c30ca54ec81eea881740cfdee8b0a/packed_binaries.go#L22

These are meant to be built by the `Makefile` target
`install-bundled-git` but this produces binaries with different names,
and we're also referring to this version of git throughout the NixOS
module, so we hack this by copying over the binaries from the deprecated
`git` target with which we're building gitaly-git.

(cherry picked from commit b5315bf)
  • Loading branch information
srhb authored and osnyx committed Nov 4, 2024
1 parent 88b8e09 commit e418e84
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ buildGoModule ({
preConfigure = ''
mkdir -p _build/bin
cp -r ${auxBins}/bin/* _build/bin
for f in ${git}/bin/git-*; do
cp "$f" "_build/bin/gitaly-$(basename $f)";
done
'';

outputs = [ "out" ];
Expand Down

0 comments on commit e418e84

Please sign in to comment.