summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-08-12 17:25:07 +0200
committerGitHub <noreply@github.com>2018-08-12 17:25:07 +0200
commitf496d26247b1c85636564f0c73d9aaef880490fe (patch)
tree71e341ecf79eec57fffa51ab8273325586b2716e /nixos/modules
parentcfa49751c7fd1ffbf31bb2b679a82678519fefc4 (diff)
parent59a2753e9e0ed17ae57f6270e155167263c8390b (diff)
downloadnixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar.gz
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar.bz2
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar.lz
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar.xz
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.tar.zst
nixlib-f496d26247b1c85636564f0c73d9aaef880490fe.zip
Merge pull request #44651 from jtojnar/gobby
gobby5: fix build
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/editors/infinoted.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
index bba21caca85d..9cc8d421270e 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -10,8 +10,8 @@ in {
 
     package = mkOption {
       type = types.package;
-      default = pkgs.libinfinity.override { daemon = true; };
-      defaultText = "pkgs.libinfinity.override { daemon = true; }";
+      default = pkgs.libinfinity;
+      defaultText = "pkgs.libinfinity";
       description = ''
         Package providing infinoted
       '';
@@ -119,7 +119,7 @@ in {
     users.groups = optional (cfg.group == "infinoted")
       { name = "infinoted";
       };
-  
+
     systemd.services.infinoted =
       { description = "Gobby Dedicated Server";
 
@@ -129,7 +129,7 @@ in {
         serviceConfig = {
           Type = "simple";
           Restart = "always";
-          ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf";
+          ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf";
           User = cfg.user;
           Group = cfg.group;
           PermissionsStartOnly = true;