diff options
| -rw-r--r-- | nixos/tests/solanum.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/irc/solanum/default.nix | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix index aabfb906aa81..1ecf91bce40b 100644 --- a/nixos/tests/solanum.nix +++ b/nixos/tests/solanum.nix @@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ ircPort ]; services.solanum = { enable = true; + motd = '' + The default MOTD doesn't contain the word "nixos" in it. + This one does. + ''; }; }; } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { @@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ${client}.wait_for_unit("ii") ${client}.wait_for_file("${iiDir}/${server}/out") '' + # look for the custom text in the MOTD. + '' + ${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out") + '' # wait until first PING from server arrives before joining, # so we don't try it too early '' diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 8080d82a185f..b6678271c31f 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { ./dont-create-logdir.patch ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' + ''; + configureFlags = [ "--enable-epoll" "--enable-ipv6" |