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/tools/networking/assh | |
| parent | 0be2928ac9f8fa7ad2245785e586381ba8002585 (diff) | |
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/tools/networking/assh')
| -rw-r--r-- | pkgs/tools/networking/assh/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 1de87e07e049..e3a147b20b17 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -9,9 +9,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/assh - '' + '' + postInstall = '' wrapProgram "$bin/bin/assh" \ --prefix PATH : ${openssh}/bin ''; |