From 3cd9a760929c43e79c280f643c7ad7f355c8f3bd Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 8 Aug 2021 13:08:13 +0100 Subject: [PATCH] go-containerregistry: make the package easier to find Also move to ldflags attribute --- pkgs/development/tools/go-containerregistry/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 52b233817ab..0fcbda69661 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -10,20 +10,19 @@ buildGoModule rec { rev = "v${version}"; hash = "sha256-3mvGHAPKDUmrQkBKwlxnF6PG0ZpZDqlM9SMkCyC5ytE="; }; - vendorSha256 = null; subPackages = [ "cmd/crane" "cmd/gcrane" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/google/go-containerregistry/cmd/crane/cmd.Version=${version} -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version=${version}" - ]; + ldflags = + let t = "github.com/google/go-containerregistry"; in + [ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ]; # NOTE: no tests doCheck = false; meta = with lib; { - description = "A tool for interacting with remote images and registries"; + description = "Tools for interacting with remote images and registries including crane and gcrane"; homepage = "https://github.com/google/go-containerregistry"; license = licenses.apsl20; maintainers = with maintainers; [ yurrriq ];