diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh')
-rwxr-xr-x | infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 9836bbe56428..828920c5accc 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/infra/libkookie/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) )") } |