quicklispPackages, lispPackages: make all system-loads pass with precompilation
This commit is contained in:
@@ -17,8 +17,14 @@ stdenv.mkDerivation {
|
||||
echo "$NIX_LISP"
|
||||
|
||||
ASDF_OUTPUT_TRANSLATIONS="${asdf}/lib/common-lisp/:$out/lib/common-lisp-compiled/" \
|
||||
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")"' \
|
||||
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
|
||||
(uiop/lisp-build:compile-file* \"${asdf}/lib/common-lisp/asdf/build/asdf.lisp\")
|
||||
(asdf:load-system :uiop :force :all)
|
||||
(asdf:load-system :asdf :force :all)
|
||||
)"' \
|
||||
"$out/bin/common-lisp.sh" "$NIX_LISP"
|
||||
|
||||
ln -s "$out/lib/common-lisp-compiled"/{asdf/uiop,uiop}
|
||||
'';
|
||||
|
||||
inherit asdf lisp;
|
||||
|
||||
@@ -6,7 +6,7 @@ ASDF_OUTPUT_TRANSLATIONS="@asdf@/lib/common-lisp/:@out@/lib/common-lisp-compiled
|
||||
addASDFPaths () {
|
||||
for j in "$1"/lib/common-lisp/*; do
|
||||
if [ -d "$j" ]; then
|
||||
CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/"
|
||||
CL_SOURCE_REGISTRY="$j/:$CL_SOURCE_REGISTRY"
|
||||
if [ -d "$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")" ]; then
|
||||
ASDF_OUTPUT_TRANSLATIONS="$j:$(dirname "$(dirname "$j")")/common-lisp-compiled/$(basename "$j")${ASDF_OUTPUT_TRANSLATIONS:+:}$ASDF_OUTPUT_TRANSLATIONS"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user