Merge pull request #172372 from Yarny0/tsm-client

tsm-client: 8.1.14.0 -> 8.1.15.0 & fix patching rpath with autoPatchelf
This commit is contained in:
Lassulus 2022-07-08 03:51:14 +02:00 committed by GitHub
commit 1963015a7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -107,10 +107,10 @@ let
unwrapped = stdenv.mkDerivation rec {
name = "tsm-client-${version}-unwrapped";
version = "8.1.14.0";
version = "8.1.15.0";
src = fetchurl {
url = mkSrcUrl version;
sha256 = "1iczc4w8rwzqnw01r89kwxcdr7pnwh3nqr3a0q8ncrxrhsy3qwn0";
hash = "sha512-K98irjGvN2QejwbOoRhnHkYdFX3ZQ8hv+v2Gb2/pnr9AE1uj6h0lEXQu2cOEHbk7jMtGwpglzofCF7yUyT/tcw==";
};
inherit meta passthru;
@ -160,6 +160,16 @@ 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 ]