Merge commit '6cc4fd6ede4909226cb81d3475834251ed1b7210'

1 files changed, 10 insertions, 4 deletions

diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 9f6404ff9cc..7f3494e4dea 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -19,10 +19,16 @@ let
     in
       fold f res res.config.warnings;
 
-  rawModule = lib.evalModules {
-    modules =
-      [ configuration ]
-      ++ (import ./modules.nix { inherit check lib pkgs; });
+  extendedLib = import ./lib/stdlib-extended.nix pkgs.lib;
+
+  hmModules =
+    import ./modules.nix {
+      inherit check pkgs;
+      lib = extendedLib;
+    };
+
+  rawModule = extendedLib.evalModules {
+    modules = [ configuration ] ++ hmModules;
     specialArgs = {
       modulesPath = builtins.toString ./.;
     };