From b426c85ce2f12b81b923bf8d0539d15a41b3a341 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 6 Oct 2017 01:26:19 -0400 Subject: 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. --- pkgs/tools/misc/direnv/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1606fffe397b..c5ea14459e2d 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -25,8 +25,6 @@ buildGoPackage rec { make install DESTDIR=$bin mkdir -p $bin/share/fish/vendor_conf.d echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/direnv ''; meta = with stdenv.lib; { -- cgit 1.4.1