alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #24607 from nh2/fix-24606-consul-version-unknown

Browse source 
Fix consul version being "unknown-unknown". Fixes #24606.
This commit is contained in:
Jörg Thalheim 2017-04-04 21:30:59 +02:00 committed by GitHub
parent 3f023c8989 b03013cb32
commit ffea5e10d7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/consul/default.nix
View file

@ -17,6 +17,10 @@ buildGoPackage rec {
# Keep consul.ui for backward compatability # Keep consul.ui for backward compatability
passthru.ui = consul-ui; 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; { meta = with stdenv.lib; {
description = "Tool for service discovery, monitoring and configuration"; description = "Tool for service discovery, monitoring and configuration";
homepage = "https://www.consul.io/"; homepage = "https://www.consul.io/";