Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #144948 from helsinki-systems/feat/samba-patch-all-libs

samba4: Fix all libraries

authored by

Janne Heß and committed by
GitHub
ce5f4a0d 3d2cd79e

+2 -2
+2 -2
pkgs/servers/samba/4.x.nix
··· 159 159 # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; 160 160 # Looks like a bug in installer scripts. 161 161 postFixup = '' 162 - export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" 162 + export SAMBA_LIBS="$(find $out -type f -regex '.*\.so\(\..*\)?' -exec dirname {} \; | sort | uniq)" 163 163 read -r -d "" SCRIPT << EOF || true 164 164 [ -z "\$SAMBA_LIBS" ] && exit 1; 165 165 BIN='{}'; ··· 168 168 patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; 169 169 patchelf --shrink-rpath "\$BIN"; 170 170 EOF 171 - find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; 171 + find $out -type f -regex '.*\.so\(\..*\)?' -exec $SHELL -c "$SCRIPT" \; 172 172 173 173 # Samba does its own shebang patching, but uses build Python 174 174 find "$out/bin" -type f -executable -exec \