mirror of
https://github.com/nix-community/home-manager.git
synced 2025-11-08 11:36:05 +01:00
integration-common: set hmModule's description directly
Removes the hack after https://github.com/NixOS/nixpkgs/pull/173621
landed.
(cherry picked from commit 0434f8e4ca)
This commit is contained in:
parent
4a724cb84c
commit
70d5929885
2 changed files with 5 additions and 14 deletions
|
|
@ -11,7 +11,8 @@ let
|
|||
|
||||
extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
|
||||
|
||||
hmModule' = types.submoduleWith {
|
||||
hmModule = types.submoduleWith {
|
||||
description = "Home Manager module";
|
||||
specialArgs = {
|
||||
lib = extendedLib;
|
||||
osConfig = config;
|
||||
|
|
@ -38,16 +39,6 @@ let
|
|||
};
|
||||
})
|
||||
] ++ cfg.sharedModules;
|
||||
} // {
|
||||
description = "Home Manager module";
|
||||
};
|
||||
|
||||
# TODO: hack until https://github.com/NixOS/nixpkgs/pull/173621 lands
|
||||
hmModule = hmModule' // {
|
||||
substSubModules = m:
|
||||
hmModule'.substSubModules m // {
|
||||
inherit (hmModule') description;
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue