fix module invocation: revert to passing flake as argument, add packa…

…ge option with default from flake
asmap · Feb 7, 2025 · d5bd6cc · d5bd6cc
1 parent 0c038a2
commit d5bd6cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -53,6 +53,6 @@
       default = kartograf;
     });
 
-    nixosModules.default = import ./nix/module.nix;
+    nixosModules.kartograf = import ./nix/module.nix self;
   };
 }
diff --git a/nix/module.nix b/nix/module.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+flake: { config, pkgs, lib, ... }:
 
 with lib;
 
@@ -16,6 +16,11 @@ in
 {
   options.services.kartograf = {
     enable = mkEnableOption "kartograf";
+    package = mkOption {
+      type = types.package;
+      default = (flake.packages.${pkgs.stdenv.hostPlatform.system}).kartograf;
+      description = mdDoc "kartograf binary to use";
+    };
     clean = mkEnableOption "cleaning up of temporary artifacts after processing." // { default = true; };
     useIRR = mkEnableOption "using Internet Routing Registry (IRR) data" // { default = true; };
     useRV = mkEnableOption "using RouteViews (RV) data" // { default = true; };
@@ -59,7 +64,7 @@ in
       serviceConfig = {
         Environment = "PYTHONUNBUFFERED=1";
         ExecStopPost = "${postScript}/bin/post-script";
-        ExecStart = ''${kartograf}/bin/kartograf map \
+        ExecStart = ''${cfg.package}/bin/kartograf map \
           ${optionalString cfg.clean "--cleanup" } \
           ${optionalString cfg.useIRR "--irr" } \
           ${optionalString cfg.useRV "--routeviews" } \