summary refs log tree commit diff
path: root/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-09-04 21:38:50 +0200
committerMichael Raskin <7c6f434c@mail.ru>2017-09-04 21:39:07 +0200
commitf01f86c5ca1b78244af9a1385282c0e7c5f6d2ad (patch)
treee4b47408f4216eb9c06678558fb522a983e04625 /pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
parent674c3c6bddbefd39f363148216767e761abce728 (diff)
downloadnixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar.gz
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar.bz2
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar.lz
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar.xz
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.tar.zst
nixpkgs-f01f86c5ca1b78244af9a1385282c0e7c5f6d2ad.zip
lispPackages.query-fs: Kill build-with-lisp.sh reference
Diffstat (limited to 'pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
-rw-r--r--pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 93a533f6ecc..a20b19643d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -67,10 +67,12 @@ in
       postInstall = ((x.overrides y).postInstall or "") + ''
         export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
 	export HOME=$PWD
-	build-with-lisp.sh sbcl \
-	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
-	  "$out/bin/query-fs" \
-	  "(query-fs:run-fs-with-cmdline-args)"
+        "$out/bin/query-fs-lisp-launcher.sh" --eval '(asdf:make :query-fs)' \
+          --eval "(progn $(for i in $linkedSystems; do echo "(asdf:make :$i)"; done) )" \
+          --eval '(setf (asdf/system:component-entry-point (asdf:find-system :query-fs))
+                           (function query-fs:run-fs-with-cmdline-args))' \
+          --eval '(asdf:perform (quote asdf:program-op) :query-fs)'
+	cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/"
       '';
     };
   };