From 57c8c6c3d2c9afec2a57433f0c06560e90724c4e Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 19:22:38 +0100 Subject: [PATCH] Revert "tsm-client: fix patching rpath with autoPatchelf" This reverts commit 1ed9ba08f1e83a5fdcebcffa0aff2d5b4452c9b1. After the underlying bug in `auto-patchelf.py` got fixed, this workaround is no longer necessary. --- pkgs/tools/backup/tsm-client/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index ef94eee2429f..03bd62924048 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -159,16 +159,6 @@ let ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done ''; - - # since 7b9fd5d1c9802131ca0a01ff08a3ff64379d2df4 - # autopatchelf misses to add $out/lib to rpath; - # we have to call autopatchelf manually as it would - # run too late and overwrite our rpath otherwise - dontAutoPatchelf = true; - postFixup = '' - autoPatchelf $out - patchelf --add-rpath $out/lib $out/lib/* - ''; }; binPath = lib.makeBinPath ([ acl gnugrep procps ]