Unverified Commit 897bc4da authored by IndeedNotJames's avatar IndeedNotJames
Browse files

xcaddy: fix build info

parent ed903ee4

pkgs/servers/caddy/xcaddy/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -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; {

pkgs/servers/caddy/xcaddy/inject_version_info.diff

0 → 100644
+16 −0
Original line number Diff line number Diff line 
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 != "" {