diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 20bab968513c..6b8e42a7c195 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 000000000000..acf7e5e08f4f --- /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