nixos/screen: fix assertion to actually execute

See https://github.com/NixOS/nixpkgs/issues/312194#issuecomment-2115239401 for explanation why the assertion currently fails to run.

Changed files
+20 -17
nixos
modules
programs
+20 -17
nixos/modules/programs/screen.nix
···
package = lib.mkPackageOptionMD pkgs "screen" { };
screenrc = lib.mkOption {
-
type = with lib.types; nullOr lines;
+
type = lib.types.lines;
+
default = "";
example = ''
defscrollback 10000
startup_message off
···
};
};
-
config = {
-
# TODO: Added in 24.05, remove before 24.11
-
assertions = [
-
{
-
assertion = cfg.screenrc != null -> cfg.enable;
-
message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true";
-
}
-
];
-
} // lib.mkIf cfg.enable {
-
environment.etc.screenrc = {
-
enable = cfg.screenrc != null;
-
text = cfg.screenrc;
-
};
-
environment.systemPackages = [ cfg.package ];
-
security.pam.services.screen = {};
-
};
+
config = lib.mkMerge [
+
{
+
# TODO: Added in 24.05, remove before 24.11
+
assertions = [
+
{
+
assertion = cfg.screenrc != "" -> cfg.enable;
+
message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true";
+
}
+
];
+
}
+
(lib.mkIf cfg.enable {
+
environment.etc.screenrc = {
+
text = cfg.screenrc;
+
};
+
environment.systemPackages = [ cfg.package ];
+
security.pam.services.screen = {};
+
})
+
];
}