diff options
author | Niklas Hambüchen <mail@nh2.me> | 2017-04-04 00:13:15 +0200 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2017-04-04 00:51:56 +0200 |
commit | b03013cb326f3b6a274ad1d60e2c5f26b077a335 (patch) | |
tree | 6bf2507cd35778638dc0c2631278838f07b29766 /pkgs | |
parent | b65dc619f013a8f24df5b16ae5c442837b226e94 (diff) | |
download | nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar.gz nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar.bz2 nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar.lz nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar.xz nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.tar.zst nixlib-b03013cb326f3b6a274ad1d60e2c5f26b077a335.zip |
Fix consul version being "unknown-unknown". Fixes #24606.
See https://github.com/hashicorp/consul/blob/v0.7.5/scripts/build.sh#L44 for how consul's build script does it.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/consul/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 41a0bea1cddb..cc566e712c29 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { # Keep consul.ui for backward compatability passthru.ui = consul-ui; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; |