about summary refs log tree commit diff
path: root/pkgs/development/libraries/speechd
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-01-30 19:12:36 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-01-31 02:44:59 +0100
commit9d886869cba7346bc030db614e0f412da86151d1 (patch)
treeea3dbae2a9e0acae7fb35e03f10c9c8e67e2135b /pkgs/development/libraries/speechd
parent6d799c394c0760633d974a7bd017c1275ac7838a (diff)
speechd: 0.8.8 → 0.9.1
0.9.0: https://lists.nongnu.org/archive/html/speechd-discuss/2019-01/msg00058.html
0.9.1: https://lists.nongnu.org/archive/html/speechd-discuss/2019-05/msg00000.html
Diffstat (limited to 'pkgs/development/libraries/speechd')
-rw-r--r--pkgs/development/libraries/speechd/default.nix22
-rw-r--r--pkgs/development/libraries/speechd/fix-paths.patch11
2 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 20bab968513c9..6b8e42a7c1953 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -1,11 +1,13 @@
 { stdenv
+, substituteAll
 , pkgconfig
 , fetchurl
 , python3Packages
-, intltool
+, gettext
 , itstool
 , libtool
 , texinfo
+, utillinux
 , autoreconfHook
 , glib
 , dotconf
@@ -37,17 +39,24 @@ let
       throw "You need to enable at least one output module.";
 in stdenv.mkDerivation rec {
   pname = "speech-dispatcher";
-  version = "0.8.8";
+  version = "0.9.1";
 
   src = fetchurl {
-    url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz";
-    sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw";
+    url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
+    hash = "sha256:16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit utillinux;
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     autoreconfHook
-    intltool
+    gettext
     libtool
     itstool
     texinfo
@@ -79,6 +88,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     # Audio method falls back from left to right.
     "--with-default-audio-method=\"libao,pulse,alsa,oss\""
+    "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system"
   ] ++ optional withPulse "--with-pulse"
     ++ optional withAlsa "--with-alsa"
     ++ optional withLibao "--with-libao"
@@ -98,6 +108,8 @@ in stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Common interface to speech synthesis";
     homepage = "https://devel.freebsoft.org/speechd";
diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/development/libraries/speechd/fix-paths.patch
new file mode 100644
index 0000000000000..acf7e5e08f4fd
--- /dev/null
+++ b/pkgs/development/libraries/speechd/fix-paths.patch
@@ -0,0 +1,11 @@
+--- a/speech-dispatcherd.service.in
++++ b/speech-dispatcherd.service.in
+@@ -19,7 +19,7 @@
+ [Service]
+ Type=forking
+ ExecStart=@bindir@/speech-dispatcher -d
+-ExecReload=/bin/kill -HUP $MAINPID
++ExecReload=@utillinux@/bin/kill -HUP $MAINPID
+ 
+ [Install]
+ WantedBy=multi-user.target