Merge pull request #293813 from mattpolzin/propagate-idris2-libs
idris2Packages.buildIdris: propagate idris libraries
This commit is contained in:
commit
d7e7fc9008
|
@ -18,11 +18,13 @@
|
||||||
, ... }@attrs:
|
, ... }@attrs:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs);
|
||||||
ipkgFileName = ipkgName + ".ipkg";
|
ipkgFileName = ipkgName + ".ipkg";
|
||||||
idrName = "idris2-${idris2.version}";
|
idrName = "idris2-${idris2.version}";
|
||||||
libSuffix = "lib/${idrName}";
|
libSuffix = "lib/${idrName}";
|
||||||
|
propagatedIdrisLibraries = propagate idrisLibraries;
|
||||||
libDirs =
|
libDirs =
|
||||||
(lib.makeSearchPath libSuffix idrisLibraries) +
|
(lib.makeSearchPath libSuffix propagatedIdrisLibraries) +
|
||||||
":${idris2}/${idrName}";
|
":${idris2}/${idrName}";
|
||||||
supportDir = "${idris2}/${idrName}/lib";
|
supportDir = "${idris2}/${idrName}/lib";
|
||||||
drvAttrs = builtins.removeAttrs attrs [
|
drvAttrs = builtins.removeAttrs attrs [
|
||||||
|
@ -35,7 +37,7 @@ let
|
||||||
inherit version;
|
inherit version;
|
||||||
src = src;
|
src = src;
|
||||||
nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or [];
|
nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or [];
|
||||||
buildInputs = idrisLibraries ++ attrs.buildInputs or [];
|
buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [];
|
||||||
|
|
||||||
IDRIS2_PACKAGE_PATH = libDirs;
|
IDRIS2_PACKAGE_PATH = libDirs;
|
||||||
|
|
||||||
|
@ -44,6 +46,10 @@ let
|
||||||
idris2 --build ${ipkgFileName}
|
idris2 --build ${ipkgFileName}
|
||||||
runHook postBuild
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
inherit propagatedIdrisLibraries;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user