Merge pull request #136572 from yu-re-ka/feature/gitaly-git2go-name-backport
[21.05] gitaly: Fix gitaly-git2go binary name
This commit is contained in:
commit
355b6d3675
@ -10,9 +10,13 @@ let
|
||||
copyGemFiles = true;
|
||||
gemdir = ./.;
|
||||
};
|
||||
in buildGoModule rec {
|
||||
version = "14.2.1";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
pname = "gitaly";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
@ -27,6 +31,10 @@ in buildGoModule rec {
|
||||
inherit rubyEnv;
|
||||
};
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags= -X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}"
|
||||
];
|
||||
|
||||
buildFlags = [ "-tags=static,system_libgit2" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
|
||||
@ -35,6 +43,7 @@ in buildGoModule rec {
|
||||
postInstall = ''
|
||||
mkdir -p $ruby
|
||||
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
|
||||
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "ruby" ];
|
||||
|
Loading…
x
Reference in New Issue
Block a user