From 58498ae061e6f4f84750281cb6d16a93f4ec151d Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 17 Nov 2019 23:09:32 +1100 Subject: [PATCH] nixos/openarena: fix service's binary name The binary name was recently changed from openarena-server to oa_ded in https://github.com/NixOS/nixpkgs/pull/71122 . That change broke the openarena module and consequently the openarena test too. This commit fixes both. As an alternative, we considered reverting the name change in https://github.com/NixOS/nixpkgs/pull/72824 but we decided oa_ded was a better name for the binary (it's the name upstream use). --- nixos/modules/services/games/openarena.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/openarena.nix b/nixos/modules/services/games/openarena.nix index b7d1aea6b8d..8c014d78809 100644 --- a/nixos/modules/services/games/openarena.nix +++ b/nixos/modules/services/games/openarena.nix @@ -43,7 +43,7 @@ in serviceConfig = { DynamicUser = true; StateDirectory = "openarena"; - ExecStart = "${pkgs.openarena}/bin/openarena-server +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}"; + ExecStart = "${pkgs.openarena}/bin/oa_ded +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}"; Restart = "on-failure"; # Hardening