From 1fd038e11b125b86dec15dcff8446422f3619241 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Jun 2023 00:48:56 +0200
Subject: [PATCH] piper-tts: 0.0.2 -> 1.2.0

https://github.com/rhasspy/piper/releases/tag/v1.0.0
https://github.com/rhasspy/piper/releases/tag/v1.1.0
https://github.com/rhasspy/piper/releases/tag/v1.2.0
---
 .../python-modules/piper-train/default.nix    |  2 ++
 pkgs/tools/audio/piper/default.nix            | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/piper-train/default.nix b/pkgs/development/python-modules/piper-train/default.nix
index 5cf8cdea10df..3adb94c8f229 100644
--- a/pkgs/development/python-modules/piper-train/default.nix
+++ b/pkgs/development/python-modules/piper-train/default.nix
@@ -10,6 +10,7 @@
 , librosa
 , numpy
 , onnxruntime
+, piper-phonemize
 , pytorch-lightning
 , torch
 }:
@@ -48,6 +49,7 @@ buildPythonPackage {
     librosa
     numpy
     onnxruntime
+    piper-phonemize
     pytorch-lightning
     torch
   ];
diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix
index c3d8a7638304..29fdb0705fec 100644
--- a/pkgs/tools/audio/piper/default.nix
+++ b/pkgs/tools/audio/piper/default.nix
@@ -1,17 +1,24 @@
 { lib
 , stdenv
 , fetchFromGitHub
+
+# build time
 , cmake
 , pkg-config
-, espeak-ng
+
+# runtime
 , onnxruntime
 , pcaudiolib
+, piper-phonemize
+, spdlog
+
+# tests
 , piper-train
 }:
 
 let
   pname = "piper";
-  version = "0.0.2";
+  version = "1.2.0";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -19,30 +26,27 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "piper";
-    rev = "70afec58bc131010c8993c154ff02a78d1e7b8b0";
-    hash = "sha256-zTW7RGcV8Hh7G6Braf27F/8s7nNjAqagp7tmrKO10BY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk=";
   };
 
   sourceRoot = "source/src/cpp";
 
-  patches = [
-    ./fix-compilation-with-newer-onnxruntime.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "/usr/local/include/onnxruntime" "${onnxruntime}"
-  '';
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
   buildInputs = [
-    espeak-ng
     onnxruntime
     pcaudiolib
+    piper-phonemize
+    piper-phonemize.espeak-ng
+    spdlog
+  ];
+
+  env.NIX_CFLAGS_COMPILE = builtins.toString [
+    "-isystem ${lib.getDev piper-phonemize}/include/piper-phonemize"
   ];
 
   installPhase = ''