public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lispPackages: load precompiled asdf; support more implementations

Browse Source
This commit is contained in:
Michael Raskin
2017-04-10 01:10:49 +02:00
parent b64163a90d
commit 58d6b50232
3 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/lisp-modules/define-package.nix
+4 -4
View File
@@ -1,7 +1,7 @@
args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
, src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
, propagatedBuildInputs ? []}:
let
let
deployConfigScript = ''
outhash="$out"
outhash="''${outhash##*/}"
@@ -39,7 +39,7 @@ let
echo "#! /bin/sh" >> "$launch_script"
echo "source '$config_script'" >> "$launch_script"
echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
'';
basePackage = {
name = "lisp-${baseName}-${version}";
@@ -66,12 +66,12 @@ basePackage = {
(asdf:operate (quote asdf::compile-bundle-op) :${testSystem})
(ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem}))
)"' \
"$out/bin/${args.baseName}-lisp-launcher.sh" ""
"$out/bin/${args.baseName}-lisp-launcher.sh"
'') testSystems}
eval "$postInstall"
'';
propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf]
propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf]
++ (args.propagatedBuildInputs or []);
buildInputs = buildInputs;
dontStrip=true;