diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/by-name/li/livecaptions/package.nix similarity index 74% rename from pkgs/applications/misc/livecaptions/default.nix rename to pkgs/by-name/li/livecaptions/package.nix index 2d52e96fe359..1dc03b3e5d85 100644 --- a/pkgs/applications/misc/livecaptions/default.nix +++ b/pkgs/by-name/li/livecaptions/package.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} ) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 154d4edec235..6117f1a5be49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1229,8 +1229,6 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; - livecaptions = callPackage ../applications/misc/livecaptions { }; - madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook {