b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #124402 from babariviere/fix/lisp-packages-darwin

Browse source 
lispPackages: fix darwin builds
This commit is contained in:
Michael Raskin 2021-05-25 18:51:06 +00:00 committed by GitHub
parent c29e090a7d 8147b87980
commit 949651d209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
View file

@ -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,14 +20,14 @@ 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
export NIX_LISP_LD_LIBRARY_PATH="${NIX_LISP_LD_LIBRARY_PATH-}${NIX_LISP_LD_LIBRARY_PATH:+:}$1/lib"
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
}