From 467e784ab633a02ed692f817d6404f6255faa2af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 31 Jan 2026 14:49:13 +0100 Subject: [PATCH] piper-phonemize: drop espeak-ng pin --- pkgs/by-name/pi/piper-phonemize/package.nix | 27 ++----------------- .../piper-phonemize/default.nix | 3 ++- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/pi/piper-phonemize/package.nix b/pkgs/by-name/pi/piper-phonemize/package.nix index 8776f98b9eb2..686071ccaa52 100644 --- a/pkgs/by-name/pi/piper-phonemize/package.nix +++ b/pkgs/by-name/pi/piper-phonemize/package.nix @@ -13,25 +13,6 @@ onnxruntime, }: -let - espeak-ng' = espeak-ng.overrideAttrs (oldAttrs: { - version = "1.52-dev"; - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "espeak-ng"; - rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; - hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; - hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; - }) - ./espeak-mbrola.patch - ]; - }); -in stdenv.mkDerivation (finalAttrs: { pname = "piper-phonemize"; version = "2023.11.14-4"; @@ -50,18 +31,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DONNXRUNTIME_DIR=${onnxruntime.dev}" - "-DESPEAK_NG_DIR=${espeak-ng'}" + "-DESPEAK_NG_DIR=${espeak-ng}" ]; buildInputs = [ - espeak-ng' + espeak-ng onnxruntime ]; - passthru = { - espeak-ng = espeak-ng'; - }; - meta = { description = "C++ library for converting text to phonemes for Piper"; homepage = "https://github.com/rhasspy/piper-phonemize"; diff --git a/pkgs/development/python-modules/piper-phonemize/default.nix b/pkgs/development/python-modules/piper-phonemize/default.nix index 159e39bb38f6..f3a9e40531ae 100644 --- a/pkgs/development/python-modules/piper-phonemize/default.nix +++ b/pkgs/development/python-modules/piper-phonemize/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + espeak-ng, onnxruntime-native, piper-phonemize-native, pybind11, @@ -18,9 +19,9 @@ buildPythonPackage { ]; buildInputs = [ + espeak-ng onnxruntime-native piper-phonemize-native - piper-phonemize-native.espeak-ng ]; # coredump in onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger()