Merge pull request #245910 from R-VdP/nixos_extend_modules

nixos: make extendModules retain pkgs on nixos configs
2023-07-30 09:38:52 +02:00
parent 8343c48f76 5054472759
commit 347a6b2d92
1 changed files with 6 additions and 4 deletions
@@ -109,8 +109,10 @@ let

  nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };

+  withExtraArgs = nixosSystem: nixosSystem // {
+    inherit extraArgs;
+    inherit (nixosSystem._module.args) pkgs;
+    extendModules = args: withExtraArgs (nixosSystem.extendModules args);
+  };
 in
-withWarnings nixosWithUserModules // {
-  inherit extraArgs;
-  inherit (nixosWithUserModules._module.args) pkgs;
-}
+withWarnings (withExtraArgs nixosWithUserModules)