lisp-modules: make spec.flags a list of strings
This commit is contained in:
parent
03ef1b250a
commit
254765f3d2
|
@ -4,7 +4,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "abcl"; program = "abcl"; flags = ""; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "abcl"; program = "abcl"; flags = []; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})}:
|
||||
let abcl = stdenv.mkDerivation rec {
|
||||
pname = "abcl";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "fasp"; program = "clasp"; flags = ""; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "fasp"; program = "clasp"; flags = []; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})
|
||||
, ...}:
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "fas"; program = "ecl"; flags = ""; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "fas"; program = "ecl"; flags = []; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "fas"; program = "ecl"; flags = ""; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "fas"; program = "ecl"; flags = []; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "fasl"; program = "sbcl"; flags = ""; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "fasl"; program = "sbcl"; flags = []; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
, commonLispPackagesFor
|
||||
, lispWithPackages
|
||||
, build-asdf-system
|
||||
, spec ? { faslExt = "fas"; program = "clisp"; flags = "-E UTF-8"; asdf = asdf_3_3; }
|
||||
, spec ? { faslExt = "fas"; program = "clisp"; flags = ["-E" "UTF-8"]; asdf = asdf_3_3; }
|
||||
, packageOverrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ let
|
|||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
cp -v ${asdf}/lib/common-lisp/asdf/build/asdf.lisp asdf.lisp
|
||||
${pkg}/bin/${program} ${flags} < <(echo '(compile-file "asdf.lisp")')
|
||||
${pkg}/bin/${program} ${toString flags} < <(echo '(compile-file "asdf.lisp")')
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
@ -116,7 +116,7 @@ let
|
|||
program ? pkg.pname,
|
||||
|
||||
# General flags to the Lisp executable
|
||||
flags ? "",
|
||||
flags ? [],
|
||||
|
||||
# Extension for implementation-dependent FASL files
|
||||
faslExt,
|
||||
|
@ -185,7 +185,7 @@ let
|
|||
buildPhase = optionalString (src != null) ''
|
||||
export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src//
|
||||
export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}"
|
||||
${pkg}/bin/${program} ${flags} < $buildScript
|
||||
${pkg}/bin/${program} ${toString flags} < $buildScript
|
||||
'';
|
||||
|
||||
# Copy compiled files to store
|
||||
|
@ -274,7 +274,7 @@ let
|
|||
makeWrapper \
|
||||
${o.pkg}/bin/${o.program} \
|
||||
$out/bin/${o.program} \
|
||||
--add-flags "${o.flags}" \
|
||||
--add-flags "${toString o.flags}" \
|
||||
--set ASDF "${o.asdfFasl}/asdf.${o.faslExt}" \
|
||||
--prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY" \
|
||||
--prefix ASDF_OUTPUT_TRANSLATIONS : "$(echo $CL_SOURCE_REGISTRY | sed s,//:,::,g):" \
|
||||
|
|
|
@ -29,7 +29,7 @@ let
|
|||
mkdir __fasls
|
||||
export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)/__fasls:${storeDir}:${storeDir}"
|
||||
export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)//
|
||||
${o.pkg}/bin/${o.program} ${o.flags or ""} < ${o.buildScript}
|
||||
${o.pkg}/bin/${o.program} ${toString (o.flags or [])} < ${o.buildScript}
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
|
|
Loading…
Reference in a new issue