From fbb0836d267ea706a2f26c5aa3e4546bab93ddb2 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Sep 2024 10:21:24 +0800
Subject: [PATCH 1/2] eflite: move to by-name; nixfmt

---
 .../audio => by-name/ef}/eflite/format.patch  |  0
 .../ef/eflite/package.nix}                    | 25 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 18 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio => by-name/ef}/eflite/format.patch (100%)
 rename pkgs/{applications/audio/eflite/default.nix => by-name/ef/eflite/package.nix} (77%)

diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/by-name/ef/eflite/format.patch
similarity index 100%
rename from pkgs/applications/audio/eflite/format.patch
rename to pkgs/by-name/ef/eflite/format.patch
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/by-name/ef/eflite/package.nix
similarity index 77%
rename from pkgs/applications/audio/eflite/default.nix
rename to pkgs/by-name/ef/eflite/package.nix
index 4808f948826943a..7624c2729fcfef7 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/by-name/ef/eflite/package.nix
@@ -1,15 +1,26 @@
-{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  flite,
+  alsa-lib,
+  debug ? false,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs:{
   pname = "eflite";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
-    sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
+    url = "mirror://sourceforge/eflite/eflite/${finalAttrs.version}/eflite-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ka2FhV5Vo/w7l6GlJdtf0dIR1UNCu/yI0QJoExBPFyE=";
   };
 
-  buildInputs = [ flite alsa-lib ];
+  buildInputs = [
+    flite
+    alsa-lib
+  ];
 
   configureFlags = [
     "flite_dir=${flite}"
@@ -46,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "eflite";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c5985bd5c991a..a2bc2fc6aa3c14c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,8 +7177,6 @@ with pkgs;
 
   eff = callPackage ../development/interpreters/eff { };
 
-  eflite = callPackage ../applications/audio/eflite { };
-
   eid-mw = callPackage ../tools/security/eid-mw {
     autoreconfHook = buildPackages.autoreconfHook269;
   };

From 1b2f7022bd324354af2da81b9fa054c46936a797 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Sep 2024 10:33:38 +0800
Subject: [PATCH 2/2] eflite: add bot-wxt1221 as maintainers; fix build

---
 pkgs/by-name/ef/eflite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ef/eflite/package.nix b/pkgs/by-name/ef/eflite/package.nix
index 7624c2729fcfef7..a6aa478947e84b5 100644
--- a/pkgs/by-name/ef/eflite/package.nix
+++ b/pkgs/by-name/ef/eflite/package.nix
@@ -8,7 +8,7 @@
   debug ? false,
 }:
 
-stdenv.mkDerivation (finalAttrs:{
+stdenv.mkDerivation (finalAttrs: {
   pname = "eflite";
   version = "0.4.1";
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs:{
   ];
 
   configureFlags = [
-    "flite_dir=${flite}"
+    "flite_dir=${flite.dev}"
     "--with-audio=alsa"
     "--with-vox=cmu_us_kal16"
   ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs:{
     '';
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
     mainProgram = "eflite";
   };
 })