quicklisp-to-nix: make it possible to run with Nix sandboxing enabled

This commit is contained in:
Michael Raskin 2017-09-04 18:58:56 +02:00
parent dd74844fff
commit e0771b0a04
2 changed files with 3 additions and 4 deletions

View File

@ -62,6 +62,7 @@ let lispPackages = rec {
version = "1.0.0"; version = "1.0.0";
src = ./quicklisp-to-nix; src = ./quicklisp-to-nix;
buildDependencies = [sbcl quicklisp-to-nix-system-info]; buildDependencies = [sbcl quicklisp-to-nix-system-info];
buildInputs = with pkgs.lispPackages; [md5 cl-emb alexandria external-program];
touch = coreutils; touch = coreutils;
nix-prefetch-url = nix; nix-prefetch-url = nix;
inherit quicklisp; inherit quicklisp;

View File

@ -310,10 +310,8 @@ Arguments:
(defun dump-image () (defun dump-image ()
"Make an executable" "Make an executable"
(with-quicklisp (dir) () (dolist (system *required-systems*)
(declare (ignore dir)) (asdf:make system))
(dolist (system *required-systems*)
(funcall (sym :ql :quickload) system)))
(register-emb "nix-package" (merge-pathnames #p"nix-package.emb" (this-file))) (register-emb "nix-package" (merge-pathnames #p"nix-package.emb" (this-file)))
(register-emb "invocation" (merge-pathnames #p"invocation.emb" (this-file))) (register-emb "invocation" (merge-pathnames #p"invocation.emb" (this-file)))
(register-emb "parasitic-invocation" (merge-pathnames #p"parasitic-invocation.emb" (this-file))) (register-emb "parasitic-invocation" (merge-pathnames #p"parasitic-invocation.emb" (this-file)))