diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index abbbdc3e77a..5149d69a0d6 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -9,7 +9,7 @@ addASDFPaths () { } setLisp () { - if [ -z "${NIX_LISP_COMMAND:-}" ]; then + if [ -z "${NIX_LISP_COMMAND:-}" ]; then for j in "$1"/bin/*; do case "$(basename "$j")" in sbcl) NIX_LISP_COMMAND="$j" ;; @@ -20,13 +20,13 @@ setLisp () { esac done fi - if [ -n "${NIX_LISP_COMMAND:-}" ] && [ -z "${NIX_LISP:-}" ]; then + if [ -n "${NIX_LISP_COMMAND:-}" ] && [ -z "${NIX_LISP:-}" ]; then NIX_LISP="${NIX_LISP_COMMAND##*/}" fi } collectNixLispLDLP () { - if echo "$1/lib"/lib*.so* | grep . > /dev/null; then + if echo "$1/lib"/lib*.{so,dylib}* | grep . > /dev/null; then export NIX_LISP_LD_LIBRARY_PATH="${NIX_LISP_LD_LIBRARY_PATH-}${NIX_LISP_LD_LIBRARY_PATH:+:}$1/lib" fi }