From 2c226107cb544c1f9baf08f9cfa149023cda78e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Jan 2019 14:12:33 +0100 Subject: [PATCH] systemd-cryptsetup-generator: fixup linkage It got broken by 74a64a8a6 #53483. But IMO it's *this* expression that was written in a too fragile way. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 703d13126a3f..2ff0e4cd38fd 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -14,12 +14,13 @@ systemd.overrideAttrs (p: { # As ninja install is not used here, the rpath needs to be manually fixed. # Otherwise the resulting binary doesn't properly link against systemd-shared.so postFixup = '' - sharedLib=libsystemd-shared-${p.version}.so for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + (patchelf --print-needed $prog | grep 'libsystemd-shared-.*\.so' > /dev/null) && ( patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog ) || true done + # test it's OK + "$out"/lib/systemd/systemd-cryptsetup ''; installPhase = ''