Unverified Commit 1b87ff2d authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #318357 from Scrumplex/pkgs/livecaptions/0.4.2

livecaptions: 0.4.1 -> 0.4.2
parents aa8c9e6f f991af45
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -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}
      )
    '';

+0 −2
Original line number Diff line number Diff line
@@ -1229,8 +1229,6 @@ with pkgs;
  libredirect = callPackage ../build-support/libredirect { };
  livecaptions = callPackage ../applications/misc/livecaptions { };
  madonctl = callPackage ../applications/misc/madonctl { };
  copyDesktopItems = makeSetupHook {