diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-06 18:43:42 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-04-06 18:47:36 +0200 |
| commit | 365e8a7b6a39a442bf07796a0541b76331e2ede4 (patch) | |
| tree | 43470ece0a115017d92ef71b1dc5546016214d35 /pkgs/development/lisp-modules/quicklisp-to-nix | |
| parent | 09b1414acd7af2775414cbddd183db7b25697841 (diff) | |
| download | nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.gz nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.bz2 nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.lz nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.xz nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.tar.zst nixlib-365e8a7b6a39a442bf07796a0541b76331e2ede4.zip | |
quicklispPackages: update to fresh QuickLisp
lispPackages: reduce environment-bombing
Diffstat (limited to 'pkgs/development/lisp-modules/quicklisp-to-nix')
| -rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb | 9 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb index a798a452365c..3b71ade03f7c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb @@ -18,8 +18,13 @@ rec { postInstall = '' find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]asd${"$"}' | while read f; do - CL_SOURCE_REGISTRY= \ - NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(asdf:load-system :$(basename "$f" .asd))'" \ + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ "$out"/bin/*-lisp-launcher.sh || mv "$f"{,.sibling}; done || true ''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb index 2cbe73c89ca3..95b60df0d017 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb @@ -8,4 +8,7 @@ let quicklisp-to-nix-packages = rec { <% @loop invocations %> <% @var code %> <% @endloop %> -}; in quicklisp-to-nix-packages +} // qlAliases {inherit quicklisp-to-nix-packages;}; +qlAliases = import ./quicklisp-to-nix-aliases.nix; +in + quicklisp-to-nix-packages |