diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index 870f323fd68..80097ade090 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -6,7 +6,6 @@ , autoPatchelfHook , rpmextract , libxcrypt-legacy -, openssl , zlib , lvm2 # LVM image backup and restore functions (optional) , acl # EXT2/EXT3/XFS ACL support (optional) @@ -118,7 +117,6 @@ let ]; buildInputs = [ libxcrypt-legacy - openssl stdenv.cc.cc zlib ]; @@ -146,7 +144,8 @@ let runHook postInstall ''; - # Fix relative symlinks after `/usr` was moved up one level + # fix relative symlinks after `/usr` was moved up one level, + # fix absolute symlinks pointing to `/opt` preFixup = '' for link in $out/lib{,64}/* $out/bin/* do @@ -158,6 +157,10 @@ let fi ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done + for link in $(find $out -type l -lname '/opt/*') + do + ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link" + done ''; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a20a18d9f9d..fc648254f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7027,13 +7027,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - enableGui = true; - }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { };