lispPackages: fix build
This commit is contained in:
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
|
||||
chmod a+x "$out"/bin/*
|
||||
|
||||
substituteAll "${./setup-hook.sh}" "setup-hook-parsed"
|
||||
addEnvHooks(){ true; };
|
||||
source setup-hook-parsed
|
||||
setLisp "${lisp}"
|
||||
echo "$NIX_LISP"
|
||||
|
||||
@@ -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,7 +20,7 @@ setLisp () {
|
||||
esac
|
||||
done
|
||||
fi
|
||||
if [ -z "$NIX_LISP" ]; then
|
||||
if [ -n "${NIX_LISP_COMMAND:-}" ] && [ -z "${NIX_LISP:-}" ]; then
|
||||
NIX_LISP="${NIX_LISP_COMMAND##*/}"
|
||||
fi
|
||||
}
|
||||
@@ -35,5 +35,5 @@ export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF
|
||||
|
||||
addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP
|
||||
|
||||
mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home"
|
||||
mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-${USER:-nixbld}-home"
|
||||
mkdir -p "$HOME"/.cache/common-lisp
|
||||
|
||||
Reference in New Issue
Block a user