Unverified Commit 347a6b2d authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #245910 from R-VdP/nixos_extend_modules 

nixos: make extendModules retain pkgs on nixos configs
parents 8343c48f 50544727

nixos/lib/eval-config.nix

+6 −4
Original line number Diff line number Diff line
@@ -109,8 +109,10 @@ let 


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



in

withWarnings nixosWithUserModules // {

  withExtraArgs = nixosSystem: nixosSystem // {

    inherit extraArgs;

  inherit (nixosWithUserModules._module.args) pkgs;

}
 
    inherit (nixosSystem._module.args) pkgs;

    extendModules = args: withExtraArgs (nixosSystem.extendModules args);

  };

in

withWarnings (withExtraArgs nixosWithUserModules)