b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #245910 from R-VdP/nixos_extend_modules

Browse source 
nixos: make extendModules retain pkgs on nixos configs
This commit is contained in:
Lassulus 2023-07-30 09:38:52 +02:00 committed by GitHub
parent 8343c48f76 5054472759
commit 347a6b2d92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/lib/eval-config.nix
View file

@ -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)