mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 02:05:02 +00:00
gitaly: Fix gitaly-git2go binary name (#136569)
e7f8fe4f67changed the binary name to always end with its module version. This makes sure gitaly's internal version references are set to the package version and renames the binary, postfixing it with the package version. (cherry picked from commitd14e9188d1)
This commit is contained in:
@@ -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" ];
|
||||
|
||||
Reference in New Issue
Block a user