diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-10-06 01:26:19 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-10-08 16:13:46 -0400 |
| commit | b426c85ce2f12b81b923bf8d0539d15a41b3a341 (patch) | |
| tree | f5e463c3cdc9e94fb2484a604594a66c93aec39e /pkgs/servers/consul | |
| parent | 0be2928ac9f8fa7ad2245785e586381ba8002585 (diff) | |
| download | nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar.gz nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar.bz2 nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar.lz nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar.xz nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.tar.zst nixlib-b426c85ce2f12b81b923bf8d0539d15a41b3a341.zip | |
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.
Diffstat (limited to 'pkgs/servers/consul')
| -rw-r--r-- | pkgs/servers/consul/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 728e7034a199..d2ad5d0bd8e8 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -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/; |