From 897bc4daabad84b73d7caa8ef2d0bd845d8c701e Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 7 Feb 2023 15:58:25 +0100 Subject: [PATCH] xcaddy: fix build info --- pkgs/servers/caddy/xcaddy/default.nix | 7 +++++++ .../caddy/xcaddy/inject_version_info.diff | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/caddy/xcaddy/inject_version_info.diff diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 96552f0e32c6..c20a0e325ec9 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -14,9 +14,16 @@ buildGoModule rec { }; patches = [ + ./inject_version_info.diff ./use_tmpdir_on_darwin.diff ]; + ldflags = [ + "-s" + "-w" + "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}" + ]; + vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y="; meta = with lib; { diff --git a/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/servers/caddy/xcaddy/inject_version_info.diff new file mode 100644 index 000000000000..4d87aa687878 --- /dev/null +++ b/pkgs/servers/caddy/xcaddy/inject_version_info.diff @@ -0,0 +1,16 @@ +diff --git a/cmd/main.go b/cmd/main.go +index ede7cd8..c553140 100644 +--- a/cmd/main.go ++++ b/cmd/main.go +@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) { + return + } + ++var customVersion string ++ + // xcaddyVersion returns a detailed version string, if available. + func xcaddyVersion() string { ++ return customVersion + mod := goModule() + ver := mod.Version + if mod.Sum != "" {