From 92f8103743f4bfd9b766847fc4bbf51083eccd8d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 21 Jul 2024 17:50:20 +0800 Subject: [PATCH] wrapper-manager-fds/modules: set pkgs on integration modules modularly Now we have consistent behavior on both manual evaluation and on the integration modules. --- modules/env/common.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/env/common.nix b/modules/env/common.nix index debfdfc..306c309 100644 --- a/modules/env/common.nix +++ b/modules/env/common.nix @@ -6,12 +6,13 @@ let wrapperManagerModule = lib.types.submoduleWith { description = "wrapper-manager module"; class = "wrapperManager"; - specialArgs = cfg.extraSpecialArgs // { - inherit pkgs; - modulesPath = builtins.toString ../wrapper-manager; - }; + specialArgs = cfg.extraSpecialArgs; modules = [ ../wrapper-manager + + ({ lib, ... }: { + config._module.args.pkgs = lib.mkDefault pkgs; + }) ] ++ cfg.sharedModules; }; in