From 065f90d25c2265f6daf2fe2ba4c56c579eba3d48 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 22 Aug 2023 03:14:47 +0300 Subject: [PATCH] cudaPackages.autoAddOpenGLRunpathHook: don't skip shared libraries --- .../cudatoolkit/auto-add-opengl-runpath-hook.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh index 395229ca79b7..f50a5f6c25c6 100644 --- a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh +++ b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh @@ -2,17 +2,21 @@ # Run addOpenGLRunpath on all dynamically linked, ELF files echo "Sourcing auto-add-opengl-runpath-hook" +elfHasDynamicSection() { + patchelf --print-rpath "$1" >& /dev/null +} + autoAddOpenGLRunpathPhase() ( local outputPaths mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done) find "${outputPaths[@]}" -type f -executable -print0 | while IFS= read -rd "" f; do if isELF "$f"; then # patchelf returns an error on statically linked ELF files - if patchelf --print-interpreter "$f" >/dev/null 2>&1; then + if elfHasDynamicSection "$f" ; then echo "autoAddOpenGLRunpathHook: patching $f" addOpenGLRunpath "$f" - elif [ -n "${DEBUG-}" ]; then - echo "autoAddOpenGLRunpathHook: skipping ELF file $f" + elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then + echo "autoAddOpenGLRunpathHook: skipping a statically-linked ELF file $f" fi fi done