From a0a7314433259ec007fb3b4d5cff6427e1bac8d9 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Mon, 4 Mar 2024 10:45:28 -0600 Subject: [PATCH] idris2Packages.buildIdris: propagate idris libraries --- pkgs/development/compilers/idris2/build-idris.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 3ad0956e3a08..e66306c4344b 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -18,11 +18,13 @@ , ... }@attrs: let + propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; + propagatedIdrisLibraries = propagate idrisLibraries; libDirs = - (lib.makeSearchPath libSuffix idrisLibraries) + + (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; supportDir = "${idris2}/${idrName}/lib"; drvAttrs = builtins.removeAttrs attrs [ @@ -35,7 +37,7 @@ let inherit version; src = src; nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or []; - buildInputs = idrisLibraries ++ attrs.buildInputs or []; + buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or []; IDRIS2_PACKAGE_PATH = libDirs; @@ -44,6 +46,10 @@ let idris2 --build ${ipkgFileName} runHook postBuild ''; + + passthru = { + inherit propagatedIdrisLibraries; + }; }; in {