From e0771b0a0425535de9d236245f126ab387d1cd37 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 4 Sep 2017 18:58:56 +0200 Subject: [PATCH] quicklisp-to-nix: make it possible to run with Nix sandboxing enabled --- pkgs/development/lisp-modules/lisp-packages.nix | 1 + .../lisp-modules/quicklisp-to-nix/ql-to-nix.lisp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index c31dc497964..a5d19ab0c16 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -62,6 +62,7 @@ let lispPackages = rec { version = "1.0.0"; src = ./quicklisp-to-nix; buildDependencies = [sbcl quicklisp-to-nix-system-info]; + buildInputs = with pkgs.lispPackages; [md5 cl-emb alexandria external-program]; touch = coreutils; nix-prefetch-url = nix; inherit quicklisp; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 790cd17b2fc..2623990856e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -310,10 +310,8 @@ Arguments: (defun dump-image () "Make an executable" - (with-quicklisp (dir) () - (declare (ignore dir)) - (dolist (system *required-systems*) - (funcall (sym :ql :quickload) system))) + (dolist (system *required-systems*) + (asdf:make system)) (register-emb "nix-package" (merge-pathnames #p"nix-package.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)))