From 9d80c2f6821d2bacbe127b7a9cbe18a26426cf3d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 4 Jun 2022 14:19:08 +0000 Subject: [PATCH] docker-slim: use buildGoModule --- .../virtualization/docker-slim/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index dbf4bb734d8..09c8de64f28 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,15 +1,9 @@ -{ lib -, buildGoPackage -, fetchFromGitHub -, makeWrapper -}: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-slim"; version = "1.37.6"; - goPackagePath = "github.com/docker-slim/docker-slim"; - src = fetchFromGitHub { owner = "docker-slim"; repo = "docker-slim"; @@ -17,16 +11,17 @@ buildGoPackage rec { sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4="; }; + vendorSha256 = null; + subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; ldflags = [ - "-s" "-w" - "-X ${goPackagePath}/pkg/version.appVersionTag=${version}" - "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}" + "-s" + "-w" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix