From a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Dec 2021 10:08:53 +0100
Subject: [PATCH] timetagger: Use default value for package option

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Suggested-by: Aaron Andersen <aaron@fosslib.net>
---
 .../modules/services/web-apps/timetagger.nix  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-apps/timetagger.nix b/nixos/modules/services/web-apps/timetagger.nix
index 9dad949b0930..085bd57872d5 100644
--- a/nixos/modules/services/web-apps/timetagger.nix
+++ b/nixos/modules/services/web-apps/timetagger.nix
@@ -43,20 +43,19 @@ in {
           If you do so, the 'bindAddr' and 'port' options are ignored.
         '';
 
-        default = null;
+        default = pkgs.timetagger.override { addr = cfg.bindAddr; port = cfg.port; };
+        defaultText = literalExpression ''
+          pkgs.timetagger.override {
+            addr = ${cfg.bindAddr};
+            port = ${cfg.port};
+          };
+        '';
         type = types.package;
       };
     };
   };
 
-  config = let
-    timetaggerPkg = if !isNull cfg.package then cfg.package else
-      pkgs.timetagger.overwriteAttrs {
-        addr = cfg.bindAddr;
-        port = cfg.port;
-      };
-
-  in mkIf cfg.enable {
+  config = mkIf cfg.enable {
     systemd.services.timetagger = {
       description = "Timetagger service";
       wantedBy = [ "multi-user.target" ];
@@ -66,7 +65,7 @@ in {
         Group = "timetagger";
         StateDirectory = "timetagger";
 
-        ExecStart = "${timetaggerPkg}/bin/timetagger";
+        ExecStart = "${cfg.package}/bin/timetagger";
 
         Restart = "on-failure";
         RestartSec = 1;