From 87505cd6a58a42de6d62f7a040e1bf5189131f2c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 8 Jun 2024 22:15:43 +0200
Subject: [PATCH 1/2] livecaptions: 0.4.1 -> 0.4.2

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../misc/livecaptions/default.nix             | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/applications/misc/livecaptions/default.nix
index 2d52e96fe359..1dc03b3e5d85 100644
--- a/pkgs/applications/misc/livecaptions/default.nix
+++ b/pkgs/applications/misc/livecaptions/default.nix
@@ -7,6 +7,7 @@
   ninja,
   pkg-config,
   cmake,
+  appstream-glib,
   desktop-file-utils,
   wrapGAppsHook4,
   onnxruntime,
@@ -21,22 +22,22 @@
     rev = "3308e68442664552de593957cad0fa443ea183dd";
     hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE=";
   };
-
-  aprilModel = fetchurl {
-    name = "april-english-dev-01110_en.april";
-    url = "https://april.sapples.net/april-english-dev-01110_en.april";
-    hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM=";
-  };
 in
   stdenv.mkDerivation (finalAttrs: {
     pname = "livecaptions";
-    version = "0.4.1";
+    version = "0.4.2";
 
     src = fetchFromGitHub {
       owner = "abb128";
       repo = "LiveCaptions";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU=";
+      hash = "sha256-bLWJQgZopuQ0t2pexazUTj1+C2weRMrL3PUhIHZ0W5M=";
+    };
+
+    model = fetchurl {
+      name = "april-english-dev-01110_en.april";
+      url = "https://april.sapples.net/april-english-dev-01110_en.april";
+      hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM=";
     };
 
     nativeBuildInputs = [
@@ -44,6 +45,7 @@ in
       ninja
       pkg-config
       cmake
+      appstream-glib # appstreamcli
       desktop-file-utils # update-desktop-database
       wrapGAppsHook4
     ];
@@ -57,12 +59,12 @@ in
 
     postUnpack = ''
       rm -r source/subprojects/april-asr
-      ln -sf ${aprilAsr} source/subprojects/april-asr
+      ln -s ${aprilAsr} source/subprojects/april-asr
     '';
 
     preFixup = ''
       gappsWrapperArgs+=(
-        --set APRIL_MODEL_PATH ${aprilModel}
+        --set APRIL_MODEL_PATH ${finalAttrs.model}
       )
     '';
 

From f991af45eaf1282f2ce6843fe717a6ebd78e0226 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 8 Jun 2024 22:18:17 +0200
Subject: [PATCH 2/2] livecaptions: move to by-name

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../default.nix => by-name/li/livecaptions/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/livecaptions/default.nix => by-name/li/livecaptions/package.nix} (100%)

diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/by-name/li/livecaptions/package.nix
similarity index 100%
rename from pkgs/applications/misc/livecaptions/default.nix
rename to pkgs/by-name/li/livecaptions/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2628ca99c049..44f48b33e758 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1242,8 +1242,6 @@ with pkgs;
 
   libredirect = callPackage ../build-support/libredirect { };
 
-  livecaptions = callPackage ../applications/misc/livecaptions { };
-
   madonctl = callPackage ../applications/misc/madonctl { };
 
   copyDesktopItems = makeSetupHook {