From fc2adf8c8e91d8b80511a312d3dbdab187b5f160 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:28:01 -0700 Subject: [PATCH 1/3] espeak{edit,-classic}: move to by-name/ --- .../espeak => by-name/es/espeak-classic}/gcc6.patch | 0 .../es/espeak-classic/package.nix} | 0 .../espeakedit-configurable-path-espeak-data.patch | 0 .../espeakedit-configurable-sox-path.patch | 0 .../es/espeakedit}/espeakedit-fix-makefile.patch | 0 .../es/espeakedit}/espeakedit-gcc6.patch | 0 .../es/espeakedit}/espeakedit-wxgtk30.patch | 0 pkgs/by-name/es/espeakedit/gcc6.patch | 13 +++++++++++++ .../edit.nix => by-name/es/espeakedit/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 10 files changed, 13 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/espeak => by-name/es/espeak-classic}/gcc6.patch (100%) rename pkgs/{applications/audio/espeak/default.nix => by-name/es/espeak-classic/package.nix} (100%) rename pkgs/{applications/audio/espeak => by-name/es/espeakedit}/espeakedit-configurable-path-espeak-data.patch (100%) rename pkgs/{applications/audio/espeak => by-name/es/espeakedit}/espeakedit-configurable-sox-path.patch (100%) rename pkgs/{applications/audio/espeak => by-name/es/espeakedit}/espeakedit-fix-makefile.patch (100%) rename pkgs/{applications/audio/espeak => by-name/es/espeakedit}/espeakedit-gcc6.patch (100%) rename pkgs/{applications/audio/espeak => by-name/es/espeakedit}/espeakedit-wxgtk30.patch (100%) create mode 100644 pkgs/by-name/es/espeakedit/gcc6.patch rename pkgs/{applications/audio/espeak/edit.nix => by-name/es/espeakedit/package.nix} (100%) diff --git a/pkgs/applications/audio/espeak/gcc6.patch b/pkgs/by-name/es/espeak-classic/gcc6.patch similarity index 100% rename from pkgs/applications/audio/espeak/gcc6.patch rename to pkgs/by-name/es/espeak-classic/gcc6.patch diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/by-name/es/espeak-classic/package.nix similarity index 100% rename from pkgs/applications/audio/espeak/default.nix rename to pkgs/by-name/es/espeak-classic/package.nix diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch b/pkgs/by-name/es/espeakedit/espeakedit-configurable-path-espeak-data.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch rename to pkgs/by-name/es/espeakedit/espeakedit-configurable-path-espeak-data.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch b/pkgs/by-name/es/espeakedit/espeakedit-configurable-sox-path.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch rename to pkgs/by-name/es/espeakedit/espeakedit-configurable-sox-path.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch b/pkgs/by-name/es/espeakedit/espeakedit-fix-makefile.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch rename to pkgs/by-name/es/espeakedit/espeakedit-fix-makefile.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch b/pkgs/by-name/es/espeakedit/espeakedit-gcc6.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-gcc6.patch rename to pkgs/by-name/es/espeakedit/espeakedit-gcc6.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch b/pkgs/by-name/es/espeakedit/espeakedit-wxgtk30.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch rename to pkgs/by-name/es/espeakedit/espeakedit-wxgtk30.patch diff --git a/pkgs/by-name/es/espeakedit/gcc6.patch b/pkgs/by-name/es/espeakedit/gcc6.patch new file mode 100644 index 000000000000..58036ecbe509 --- /dev/null +++ b/pkgs/by-name/es/espeakedit/gcc6.patch @@ -0,0 +1,13 @@ +diff --git c/src/tr_languages.cpp i/src/tr_languages.cpp +index ec210a5..9503f47 100755 +--- c/src/tr_languages.cpp ++++ i/src/tr_languages.cpp +@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const char string_ordinal[] = {char(0xc2),char(0xba),0}; // masculine ordinal character, UTF-8 + + + static Translator* NewTranslator(void) diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/by-name/es/espeakedit/package.nix similarity index 100% rename from pkgs/applications/audio/espeak/edit.nix rename to pkgs/by-name/es/espeakedit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc70e4476e16..8744e19d9a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8678,12 +8678,8 @@ with pkgs; eval = false; } emacs.pkgs; - espeak-classic = callPackage ../applications/audio/espeak { }; - espeak = espeak-ng; - espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; From f8734c8da9f810d7569be0e8fae201813571453f Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:30:50 -0700 Subject: [PATCH 2/3] espeak-classic: add missing runHooks --- pkgs/by-name/es/espeak-classic/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/es/espeak-classic/package.nix b/pkgs/by-name/es/espeak-classic/package.nix index b2d68e2c24bf..ac183190ae49 100644 --- a/pkgs/by-name/es/espeak-classic/package.nix +++ b/pkgs/by-name/es/espeak-classic/package.nix @@ -31,8 +31,10 @@ stdenv.mkDerivation (finalAttrs: { ''); configurePhase = '' + runHook preConfigure cd src makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" + runHook postConfigure ''; meta = { From 38b6207b9eecae3af8b0e1a69c77deaeef3d30c8 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:33:28 -0700 Subject: [PATCH 3/3] espeakedit: add missing runHooks --- pkgs/by-name/es/espeakedit/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/es/espeakedit/package.nix b/pkgs/by-name/es/espeakedit/package.nix index 13d31d066065..a0bc6e1d3b65 100644 --- a/pkgs/by-name/es/espeakedit/package.nix +++ b/pkgs/by-name/es/espeakedit/package.nix @@ -61,12 +61,15 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = '' + runHook preBuild make -C src + runHook postBuild ''; installPhase = '' - mkdir -p "$out/bin" - cp src/espeakedit "$out/bin" + runHook preInstall + install -D src/espeakedit -t $out/bin + runHook postInstall ''; meta = {