diff options
Diffstat (limited to 'nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh')
| -rwxr-xr-x | nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 9836bbe56428..828920c5accc 100755 --- a/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -95,8 +95,8 @@ nix_lisp_run_single_form(){ nix_lisp_build_system(){ NIX_LISP_FINAL_PARAMETERS=( "$NIX_LISP_EXEC_CODE" "(progn - (asdf:make :$1) - (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:make s)))" + (asdf:load-system :$1) + (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:load-system s)))" "$NIX_LISP_EXEC_CODE" "(progn (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) #+cffi(setf cffi:*foreign-library-directories* @@ -106,15 +106,19 @@ nix_lisp_build_system(){ :separator \":\") for l in sb-alien::*shared-objects* for ns := (sb-alien::shared-object-namestring l) + do (format *error-output* \"Searching alien object ~s in ~s~%\" + ns libpath) do (and (> (length ns) 0) (not (equal (elt ns 0) \"/\")) (let* ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) (when fullpath + (format *error-output* \"Found: ~s~%\" fullpath) (setf (sb-alien::shared-object-namestring l) fullpath (sb-alien::shared-object-pathname l) (probe-file fullpath))))) ) + $4 (asdf:perform (quote asdf:program-op) :$1) )") } |