mirror of
https://github.com/nix-community/flakelight.git
synced 2025-08-09 07:05:02 +02:00
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:
@ -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
|
||||
|
Reference in New Issue
Block a user