diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2021-12-21 10:08:53 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2022-01-15 09:07:52 +0100 |
commit | a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a (patch) | |
tree | 4a4bd6dae4ea045bdd9bfc03eeb36ae67b961846 | |
parent | f3eaf668820a41ec78a6b6d8aedb078b4a87372e (diff) | |
download | nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar.gz nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar.bz2 nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar.lz nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar.xz nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.tar.zst nixpkgs-a24dc8d2ef61ccbd16f2a046c83be2e5ab2bdd9a.zip |
timetagger: Use default value for package option
Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Suggested-by: Aaron Andersen <aaron@fosslib.net>
-rw-r--r-- | nixos/modules/services/web-apps/timetagger.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/nixos/modules/services/web-apps/timetagger.nix b/nixos/modules/services/web-apps/timetagger.nix index 9dad949b093..085bd57872d 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; |