Fix build after module changes

alexarice · Aug 19, 2020 · 84f0dae · 84f0dae
1 parent cc13813
commit 84f0dae
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/default.nix b/default.nix
@@ -25,14 +25,24 @@ let
                   options = removeAttrs (oldModule.options or {}) [ "package" ];
                 } else oldModule;
 
+          cleanseConfig = f: { config, lib, epkgs, pkgs, ... }@args:
+            let
+              oldModule = f args;
+            in if oldModule ? options then
+            {
+              inherit (oldModule) options;
+            } else {};
+
           pkgsModule = {
             config._module.args.pkgs = pkgs;
             config._module.args.epkgs = epkgs;
             config._module.check = true;
           };
 
+          cleansedPackageModules = map cleanseConfig modules.packageModules;
+
           preEval = evalModules {
-            modules = modules.packageModules ++ [ pkgsModule ];
+            modules = cleansedPackageModules ++ [ pkgsModule ];
           };
 
           optionsModule = {
@@ -49,7 +59,7 @@ let
             inherit (evaledModule.config) rawPackageList initEl externalPackageList;
             docs = import ./doc {
               inherit epkgs pkgs lib;
-              inherit (modules) packageModules;
+              packageModules = cleansedPackageModules;
               finalModules = [ optionsModule ] ++ cleansedModules;
             };
           }