Unverified Commit ca0d8e59 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #330440: nixos/speechd: avoid by default on headless systems 

...into staging-next
parents 442b344f 1e9b3c1a

nixos/modules/services/accessibility/speechd.nix

+2 −3
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ in 
{

  options.services.speechd = {

    # FIXME: figure out how to deprecate this EXTREMELY CAREFULLY

    enable = mkEnableOption "speech-dispatcher speech synthesizer daemon" // {

      default = true;

    };

    # default guessed conservatively in ../misc/graphical-desktop.nix

    enable = mkEnableOption "speech-dispatcher speech synthesizer daemon";

    package = mkPackageOption pkgs "speechd" { };

  };

nixos/modules/services/misc/graphical-desktop.nix

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ in 


    programs.gnupg.agent.pinentryPackage = lib.mkOverride 1100 pkgs.pinentry-gnome3;



    services.speechd.enable = lib.mkDefault true;



    systemd.defaultUnit = lib.mkIf (xcfg.autorun || dmcfg.enable) "graphical.target";



    xdg = {