diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 01:31:21 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 01:40:26 +0200 |
commit | 4ce95e453b13f3a53ec4c788278d95a88330b701 (patch) | |
tree | 18d67a0065e9d98368c9701e07e5a6e105593598 /nixos | |
parent | 2428f5dda13475afba2dee93f4beb2bd97086930 (diff) | |
download | nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar.gz nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar.bz2 nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar.lz nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar.xz nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.tar.zst nixlib-4ce95e453b13f3a53ec4c788278d95a88330b701.zip |
libinfinity: modernize expression
* Use multiple outputs to reduce the number of rebuilds necessary. * Fix build with GTK+ support
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/editors/infinoted.nix | 8 |
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; |