From 8c2bb53e5a20e2c842f867e228a85b340c4d08b9 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 8 Sep 2024 07:39:13 +0000
Subject: [PATCH 1/2] ekho: move to by-name

---
 .../audio/ekho/default.nix => by-name/ek/ekho/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/ekho/default.nix => by-name/ek/ekho/package.nix} (93%)

diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/by-name/ek/ekho/package.nix
similarity index 93%
rename from pkgs/applications/audio/ekho/default.nix
rename to pkgs/by-name/ek/ekho/package.nix
index c0cde8aaf9a1..0f691f457d46 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/by-name/ek/ekho/package.nix
@@ -10,7 +10,7 @@
 , espeak-ng
 , sonic
 , utf8cpp
-, AudioUnit
+, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config autoconf automake libtool ];
 
   buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ]
-    ++ lib.optionals stdenv.isDarwin [ AudioUnit ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ];
 
   meta = with lib; {
     description = "Chinese text-to-speech software";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1415f7c7e3f3..fcdd2d13b0ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29516,10 +29516,6 @@ with pkgs;
 
   oed = callPackage ../applications/editors/oed { };
 
-  ekho = callPackage ../applications/audio/ekho {
-    inherit (darwin.apple_sdk.frameworks) AudioUnit;
-  };
-
   electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
 
   electrum = libsForQt5.callPackage ../applications/misc/electrum { };

From 6abda61b067607e3eaebe0fbb5ed13e9e078af2f Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 8 Sep 2024 07:40:37 +0000
Subject: [PATCH 2/2] ekho: use finalAttrs

---
 pkgs/by-name/ek/ekho/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ek/ekho/package.nix b/pkgs/by-name/ek/ekho/package.nix
index 0f691f457d46..043908298266 100644
--- a/pkgs/by-name/ek/ekho/package.nix
+++ b/pkgs/by-name/ek/ekho/package.nix
@@ -13,14 +13,14 @@
 , darwin
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ekho";
   version = "9.0";
 
   src = fetchFromGitHub {
     owner = "hgneng";
     repo = "ekho";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk=";
   };
 
@@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ aaronjheng ];
+    mainProgram = "ekho";
   };
-}
+})