push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,21 @@
diff --git a/src/modules/espeak.c b/src/modules/espeak.c
index 94a01197..9bb34475 100644
--- a/src/modules/espeak.c
+++ b/src/modules/espeak.c
@@ -898,13 +898,13 @@ static SPDVoice **espeak_list_synthesis_voices()
path = g_strdup_printf("%s/mbrola/%s", espeak_data, voicename);
if (access(path, O_RDONLY) != 0) {
g_free(path);
- path = g_strdup_printf("/usr/share/mbrola/%s", voicename);
+ path = g_strdup_printf("@mbrola@/share/mbrola/%s", voicename);
if (access(path, O_RDONLY) != 0) {
g_free(path);
- path = g_strdup_printf("/usr/share/mbrola/%s/%s", voicename, voicename);
+ path = g_strdup_printf("@mbrola@/share/mbrola/%s/%s", voicename, voicename);
if (access(path, O_RDONLY) != 0) {
g_free(path);
- path = g_strdup_printf("/usr/share/mbrola/voices/%s", voicename);
+ path = g_strdup_printf("@mbrola@/share/mbrola/voices/%s", voicename);
if (access(path, O_RDONLY) != 0) {
g_free(path);
espeak_mbrola[j] = NULL;

View File

@@ -0,0 +1,23 @@
diff --git a/speech-dispatcher.service.in b/speech-dispatcher.service.in
index 6280f2d9..edf6024c 100644
--- a/speech-dispatcher.service.in
+++ b/speech-dispatcher.service.in
@@ -20,4 +20,4 @@ Requires=speech-dispatcher.socket
[Service]
Type=simple
ExecStart=@bindir@/speech-dispatcher -s -t 0
-ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=@utillinux@/bin/kill -HUP $MAINPID
diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in
index ab14b99d..12521b1b 100644
--- a/speech-dispatcherd.service.in
+++ b/speech-dispatcherd.service.in
@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers
[Service]
Type=forking
ExecStart=@bindir@/speech-dispatcher -d -t 0
-ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=@utillinux@/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

View File

@@ -0,0 +1,157 @@
{
stdenv,
lib,
replaceVars,
pkg-config,
fetchurl,
python3Packages,
gettext,
itstool,
libtool,
texinfo,
systemdMinimal,
util-linux,
autoreconfHook,
glib,
dotconf,
libsndfile,
withLibao ? true,
libao,
withPulse ? false,
libpulseaudio,
withAlsa ? false,
alsa-lib,
withOss ? false,
withFlite ? true,
flite,
withEspeak ? true,
espeak,
sonic,
pcaudiolib,
mbrola,
withPico ? true,
svox,
libsOnly ? false,
}:
let
inherit (python3Packages) python pyxdg wrapPython;
in
stdenv.mkDerivation (finalAttrs: {
pname = "speech-dispatcher";
version = "0.12.1";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${finalAttrs.version}/speech-dispatcher-${finalAttrs.version}.tar.gz";
sha256 = "sha256-sUpSONKH0tzOTdQrvWbKZfoijn5oNwgmf3s0A297pLQ=";
};
patches = [
(replaceVars ./fix-paths.patch {
utillinux = util-linux;
# patch context
bindir = null;
})
]
++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
# Replace FHS paths.
(replaceVars ./fix-mbrola-paths.patch {
inherit mbrola;
})
];
nativeBuildInputs = [
pkg-config
autoreconfHook
gettext
libtool
itstool
texinfo
wrapPython
];
buildInputs = [
glib
dotconf
libsndfile
libao
libpulseaudio
python
]
++ lib.optionals stdenv.hostPlatform.isLinux [
systemdMinimal # libsystemd
]
++ lib.optionals withAlsa [
alsa-lib
]
++ lib.optionals withEspeak [
espeak
sonic
pcaudiolib
]
++ lib.optionals withFlite [
flite
]
++ lib.optionals withPico [
svox
];
pythonPath = [
pyxdg
];
configureFlags = [
# Audio method falls back from left to right.
"--with-default-audio-method=\"libao,pulse,alsa,oss\""
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
]
++ lib.optionals withPulse [
"--with-pulse"
]
++ lib.optionals withAlsa [
"--with-alsa"
]
++ lib.optionals withLibao [
"--with-libao"
]
++ lib.optionals withOss [
"--with-oss"
]
++ lib.optionals withEspeak [
"--with-espeak-ng"
]
++ lib.optionals withPico [
"--with-pico"
];
postPatch = lib.optionalString withPico ''
substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
'';
postInstall =
if libsOnly then
''
rm -rf $out/{bin,etc,lib/speech-dispatcher,lib/systemd,libexec,share}
''
else
''
wrapPythonPrograms
'';
enableParallelBuilding = true;
meta = with lib; {
description =
"Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only";
homepage = "https://devel.freebsoft.org/speechd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [
berce
jtojnar
];
# TODO: remove checks for `withPico` once PR #375450 is merged
platforms = if withAlsa || withPico then platforms.linux else platforms.unix;
mainProgram = "speech-dispatcher";
};
})