mirror of
https://github.com/foo-dogsquared/nix-module-wrapper-manager-fds.git
synced 2025-01-31 04:58:17 +00:00
wrapper-manager-fds/modules: set pkgs on integration modules modularly
Now we have consistent behavior on both manual evaluation and on the integration modules.
This commit is contained in:
parent
3d6e91bf21
commit
92f8103743
9
modules/env/common.nix
vendored
9
modules/env/common.nix
vendored
@ -6,12 +6,13 @@ let
|
|||||||
wrapperManagerModule = lib.types.submoduleWith {
|
wrapperManagerModule = lib.types.submoduleWith {
|
||||||
description = "wrapper-manager module";
|
description = "wrapper-manager module";
|
||||||
class = "wrapperManager";
|
class = "wrapperManager";
|
||||||
specialArgs = cfg.extraSpecialArgs // {
|
specialArgs = cfg.extraSpecialArgs;
|
||||||
inherit pkgs;
|
|
||||||
modulesPath = builtins.toString ../wrapper-manager;
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
../wrapper-manager
|
../wrapper-manager
|
||||||
|
|
||||||
|
({ lib, ... }: {
|
||||||
|
config._module.args.pkgs = lib.mkDefault pkgs;
|
||||||
|
})
|
||||||
] ++ cfg.sharedModules;
|
] ++ cfg.sharedModules;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
Loading…
Reference in New Issue
Block a user