···

       
7
       
7
       
 
       
let

     

       
8
       
8
       
 
       
  cfg = config.services.speechd;

     

       
9
       
9
       
 
       
  inherit (lib)

     

       
10
       
10
       
-
       
    getExe

     

       
11
       
10
       
 
       
    mkEnableOption

     

       
12
       
11
       
 
       
    mkIf

     

       
13
       
12
       
 
       
    mkPackageOption

     
···

       
21
       
20
       
 
       
    package = mkPackageOption pkgs "speechd" { };

     

       
22
       
21
       
 
       
  };

     

       
23
       
22
       
 
       


     

       
24
       
24
       
-
       
  # FIXME: speechd 0.12 (or whatever the next version is)

     

       
25
       
25
       
-
       
  # will support socket activation, so switch to that once it's out.

     

       
26
       
23
       
 
       
  config = mkIf cfg.enable {

     

       
27
       
24
       
 
       
    environment = {

     

       
28
       
25
       
 
       
      systemPackages = [ cfg.package ];

     

       
29
       
29
       
-
       
      sessionVariables.SPEECHD_CMD = getExe cfg.package;

     

       
30
       
26
       
 
       
    };

     

       
27
       
27
       
+
       
    systemd.packages = [ cfg.package ];

     

       
28
       
28
       
+
       
    # have to set `wantedBy` since `systemd.packages` ignores `[Install]`

     

       
29
       
29
       
+
       
    systemd.user.sockets.speech-dispatcher.wantedBy = [ "sockets.target" ];

     

       
31
       
30
       
 
       
  };

     

       
32
       
31
       
 
       
}

     

···

       
1
       
1
       
+
       
diff --git a/speech-dispatcher.service.in b/speech-dispatcher.service.in

     

       
2
       
2
       
+
       
index 6280f2d9..edf6024c 100644

     

       
3
       
3
       
+
       
--- a/speech-dispatcher.service.in

     

       
4
       
4
       
+
       
+++ b/speech-dispatcher.service.in

     

       
5
       
5
       
+
       
@@ -20,4 +20,4 @@ Requires=speech-dispatcher.socket

     

       
6
       
6
       
+
       
 [Service]

     

       
7
       
7
       
+
       
 Type=simple

     

       
8
       
8
       
+
       
 ExecStart=@bindir@/speech-dispatcher -s -t 0

     

       
9
       
9
       
+
       
-ExecReload=/bin/kill -HUP $MAINPID

     

       
10
       
10
       
+
       
+ExecReload=@utillinux@/bin/kill -HUP $MAINPID

     

       
1
       
11
       
 
       
diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in

     

       
2
       
12
       
 
       
index ab14b99d..12521b1b 100644

     

       
3
       
13
       
 
       
--- a/speech-dispatcherd.service.in

     

···

       
9
       
9
       
 
       
  itstool,

     

       
10
       
10
       
 
       
  libtool,

     

       
11
       
11
       
 
       
  texinfo,

     

       
12
       
12
       
+
       
  systemdMinimal,

     

       
12
       
13
       
 
       
  util-linux,

     

       
13
       
14
       
 
       
  autoreconfHook,

     

       
14
       
15
       
 
       
  glib,

     
···

       
79
       
80
       
 
       
      libpulseaudio

     

       
80
       
81
       
 
       
      python

     

       
81
       
82
       
 
       
    ]

     

       
83
       
83
       
+
       
    ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       
84
       
84
       
+
       
      systemdMinimal # libsystemd

     

       
85
       
85
       
+
       
    ]

     

       
82
       
86
       
 
       
    ++ lib.optionals withAlsa [

     

       
83
       
87
       
 
       
      alsa-lib

     

       
84
       
88
       
 
       
    ]

     
···

       
103
       
107
       
 
       
      # Audio method falls back from left to right.

     

       
104
       
108
       
 
       
      "--with-default-audio-method=\"libao,pulse,alsa,oss\""

     

       
105
       
109
       
 
       
      "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

     

       
110
       
110
       
+
       
      "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"

     

       
106
       
111
       
 
       
    ]

     

       
107
       
112
       
 
       
    ++ lib.optionals withPulse [

     

       
108
       
113
       
 
       
      "--with-pulse"