From da303bba588512441065f5b65c7e4f4829f0691d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Nov 2014 11:17:17 +0300 Subject: [PATCH] Handle propagated library inputs for FFI --- pkgs/development/lisp-modules/define-package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 675fc7e7468..bb6baddc47d 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,5 +1,5 @@ args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, - buildInputs ? [], meta ? {}, overrides?(x: {})}: + buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}: let deployConfigScript = '' config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh @@ -38,7 +38,8 @@ basePackage = { ${deployConfigScript} ${deployLaunchScript} ''; - propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp]; + propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] + ++ (args.propagatedBuildInputs or []); buildInputs = buildInputs; dontStrip=true; meta = {