diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-09-04 18:58:56 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-09-04 21:39:07 +0200 |
commit | e0771b0a0425535de9d236245f126ab387d1cd37 (patch) | |
tree | e6afe8c1ad952b13d57a433a6ed6fb8b4fbf8326 /pkgs/development/lisp-modules | |
parent | dd74844fff2f243f6ba87c0eb68231315caeac39 (diff) | |
download | nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar.gz nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar.bz2 nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar.lz nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar.xz nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.tar.zst nixpkgs-e0771b0a0425535de9d236245f126ab387d1cd37.zip |
quicklisp-to-nix: make it possible to run with Nix sandboxing enabled
Diffstat (limited to 'pkgs/development/lisp-modules')
-rw-r--r-- | pkgs/development/lisp-modules/lisp-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/development/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))) |