integration-common: set hmModule's description directly

Removes the hack after NixOS/nixpkgs#173621 landed.
wuyoli · Jun 26, 2022 · 0434f8e · 0434f8e
1 parent 0ca0b91
commit 0434f8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/common.nix b/nixos/common.nix
@@ -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 {