summary refs log tree commit diff
path: root/pkgs/development/lisp-modules
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-11-14 23:16:40 +0300
committerMichael Raskin <7c6f434c@mail.ru>2014-11-15 15:40:45 +0300
commit83999a0a84733ec238e791d58cc93d391f65d95a (patch)
treec3bd6d1bb9746aad30039f44467b1943dcf0b17e /pkgs/development/lisp-modules
parent1bfe4e59c20d312be6442e1737a681316211b48e (diff)
downloadnixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar.gz
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar.bz2
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar.lz
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar.xz
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.tar.zst
nixpkgs-83999a0a84733ec238e791d58cc93d391f65d95a.zip
Fix CLisp support in executable building
Diffstat (limited to 'pkgs/development/lisp-modules')
-rwxr-xr-xpkgs/development/lisp-modules/clwrapper/build-with-lisp.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
index 3e37cc0b8f7..bdb7f724cc7 100755
--- a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
+++ b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh
@@ -46,7 +46,7 @@ case "$NIX_LISP" in
                 systems=":sb-posix $systems"
                 ;;
         ecl)
-                NIX_LISP_BUILD_CODE="(asdf:make-build (first (list $systems)) :type :program :monolithic nil :epilogue-code '(progn (defpackage :asdf/image) $code) :move-here \"$target\")"
+		NIX_LISP_BUILD_CODE="()"
                 ;;
         clisp)
                 NIX_LISP_BUILD_CODE="(ext:saveinitmem \"$target\" :norc t :init-function (lambda () $code (ext:bye)) :script nil :executable 0)"
@@ -54,8 +54,7 @@ case "$NIX_LISP" in
 esac
 
 "$lisp" \
-  "$NIX_LISP_EXEC_CODE" "(require :asdf)" \
   "$NIX_LISP_EXEC_CODE" "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \
-  "$NIX_LISP_EXEC_CODE" "(mapcar 'require (list $systems))" \
+  "$NIX_LISP_EXEC_CODE" "(mapcar 'asdf:load-system (list $systems))" \
   "$NIX_LISP_EXEC_CODE" "$NIX_LISP_BUILD_CODE" \
   "$NIX_LISP_EXEC_CODE" "(quit)"