Don't evaluate all attrs passed into mkSearchData (#150)

NuschtOS · Oct 26, 2024 · cf1d132 · cf1d132
1 parent 6ee67ef
commit cf1d132
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/nix/wrapper.nix b/nix/wrapper.nix
@@ -18,15 +18,14 @@ rec {
 
   mkSearchData = scopes:
     let
-      optionsJSON = opt: opt.optionsJSON or (mkOptionsJSON {
-        inherit (opt) modules;
-        specialArgs = opt.specialArgs or { };
-      });
-      config = {
-        scopes = map
-          (scope: (lib.filterAttrs (name: _value: name != "modules") scope) // { optionsJson = optionsJSON scope; })
-          scopes;
-      };
+      config.scopes = map (scope: {
+        inherit (scope) urlPrefix;
+      } // lib.optionalAttrs (scope?name) { inherit (scope) name; } // {
+        optionsJson = scope.optionsJSON or (mkOptionsJSON {
+          modules = scope.modules or (throw "A scope requires either optionsJSON or module!");
+          specialArgs = scope.specialArgs or { };
+        });
+      }) scopes;
     in
     runCommand "search-meta"
       {