diff options
author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-10-08 16:21:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 16:21:27 -0400 |
commit | 416979f3f77a855b4460fa15cab52445378f660e (patch) | |
tree | 835594ae16861a2c5769bcbc747c22271f690709 /pkgs/tools | |
parent | d32f7f4bb3b6a80fa79f097881b92bcebf702478 (diff) | |
parent | b426c85ce2f12b81b923bf8d0539d15a41b3a341 (diff) | |
download | nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar.gz nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar.bz2 nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar.lz nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar.xz nixlib-416979f3f77a855b4460fa15cab52445378f660e.tar.zst nixlib-416979f3f77a855b4460fa15cab52445378f660e.zip |
Merge pull request #30150 from copumpkin/no-rpath-nonsense
Get rid of most @rpath nonsense on Darwin
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/go-mtpfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/direnv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/assh/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/keybase/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/sudolikeaboss/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/sift/default.nix | 4 |
6 files changed, 1 insertions, 21 deletions
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index f46dd74b2660..028aef6024b1 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,9 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath "$out/lib" $bin/bin/go-mtpfs - ''; - goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index cfad499a432b..f36a6d51b360 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; { 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 ''; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 049867afcd72..7f095a3225bb 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; }; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/keybase - ''; - buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 066fef39a82a..15f767415890 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,10 +22,6 @@ buildGoPackage rec { fixDarwinDylibNames ]; - postInstall = '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sudolikeaboss - ''; - meta = with stdenv.lib; { inherit version; inherit (src.meta) homepage; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 1e688942a49e..fd4cef27ba17 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sift - ''; - meta = with lib; { description = "sift is a fast and powerful alternative to grep"; homepage = https://sift-tool.org; |