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/applications/networking/syncthing | |
| 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/applications/networking/syncthing')
| -rw-r--r-- | pkgs/applications/networking/syncthing/inotify.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index c83d9a2fcd006..e33501a171585 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -25,8 +25,6 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/lib/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; { |