Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the weird choice LLVM made to hardcode @rpath in its install name, and then lets us remove a ton of annoying workaround hacks in many of our Go packages. With any luck this will mean less hackery going forward.
This commit is contained in:
@@ -21,10 +21,6 @@ buildGoPackage rec {
|
||||
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=")
|
||||
'';
|
||||
|
||||
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -delete_rpath $out/lib $bin/bin/consul
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tool for service discovery, monitoring and configuration";
|
||||
homepage = https://www.consul.io/;
|
||||
|
||||
Reference in New Issue
Block a user