Use submoduleWith instead of submodule

This results in not enabling shorthandOnlyDefinesConfig, allowing
imports to be set in submodules. This can, for example, allow a devShell
to import another devShell's config to extend it.
This commit is contained in:
Archit Gupta
2024-03-21 04:10:38 -07:00
parent 5fe9313894
commit fe5916eb40
3 changed files with 18 additions and 8 deletions

View File

@ -6,7 +6,7 @@
let
inherit (lib) filterAttrs functionArgs mapAttrs mkIf mkMerge mkOption;
inherit (lib.types) coercedTo lazyAttrsOf lines listOf
package str submodule;
package str submoduleWith;
inherit (flakelight) supportedSystem;
inherit (flakelight.types) function nullable optCallWith optFunctionTo;
@ -53,7 +53,7 @@ let
devShellType = coercedTo function wrapFn
(optFunctionTo (coercedTo package packageOverride
(submodule devShellModule)));
(submoduleWith { modules = [ devShellModule ]; })));
genDevShell = pkgs: cfg:
if cfg.overrideShell != null then cfg.overrideShell