all repos — searchix @ 4c4b980bff860dda725253438b499245338161df

Search engine for NixOS, nix-darwin, home-manager and NUR users

build: enable non-flake import

Alan Pearce
commit

4c4b980bff860dda725253438b499245338161df

parent

e9eed3ddc4229db707cccb30beddde15044eff16

1 file changed, 4 insertions(+), 4 deletions(-)

changed files
M nix/modules/default.nix → nix/modules/default.nix
@@ -1,4 +1,3 @@
-flake:
 { config
 , lib
 , pkgs

@@ -9,7 +8,7 @@ let
   inherit (builtins) fromTOML readFile;
   cfg = config.services.searchix;
 
-  package = flake.packages.${pkgs.system}.default;
+  package = pkgs.callPackage ../.. { };
 
   defaults = fromTOML (readFile ../../defaults.toml);
 

@@ -91,6 +90,7 @@ default = "info";
           };
 
           web = mkOption {
+            default = { };
             type = types.submodule {
               freeformType = settingsFormat.type;
               options = {

@@ -113,7 +113,7 @@ in
                   mkOption {
                     type = types.str;
                     description = "The base URL that searchix will be served on.";
-                    default = "http://${web.listenAddress}:${web.port}";
+                    default = "http://${web.listenAddress}:${toString web.port}";
                   };
 
                 environment = mkOption {

@@ -146,6 +146,7 @@ };
           };
 
           importer = mkOption {
+            default = { };
             type = types.submodule {
               freeformType = settingsFormat.type;
 

@@ -179,7 +180,6 @@ };
           };
         };
       };
-      default = { };
       description = ''
         Configuration for searchix.