diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-10 01:10:39 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-04-10 01:10:49 +0200 |
commit | 58d6b50232b350511207a4723de3b1a17dae26fa (patch) | |
tree | 7e044b3ce2a85b6a2b4183c1eb9f1f841f1a7456 /pkgs/development/lisp-modules/define-package.nix | |
parent | b64163a90d395c9b0edc2c38c12875802968c191 (diff) | |
download | nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar.gz nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar.bz2 nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar.lz nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar.xz nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.tar.zst nixpkgs-58d6b50232b350511207a4723de3b1a17dae26fa.zip |
lispPackages: load precompiled asdf; support more implementations
Diffstat (limited to 'pkgs/development/lisp-modules/define-package.nix')
-rw-r--r-- | pkgs/development/lisp-modules/define-package.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 520e224e6da..1acedf4b704 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -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; |