Commit 8e7a0982 authored by K900's avatar K900
Browse files

speechd: introduce minimal variant, use it everywhere

parent 9e852fdd

pkgs/applications/accessibility/dasher/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
, libxslt

, libxml2

, speechSupport ? true

, speechd

, speechd-minimal

}:



stdenv.mkDerivation {
@@ -56,7 +56,7 @@ stdenv.mkDerivation { 
    # at-spi2 needs dbus to be recognized by pkg-config

    at-spi2-core

    dbus

  ] ++ lib.optional speechSupport speechd;

  ] ++ lib.optional speechSupport speechd-minimal;



  enableParallelBuilding = true;

pkgs/applications/audio/rhvoice/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, glibmm

, libpulseaudio

, libao

, speechd

, speechd-minimal

}:



stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 
    glibmm

    libpulseaudio

    libao

    speechd

    speechd-minimal

  ];



  meta = {

pkgs/applications/misc/calibre/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
, qmake

, qtbase

, qtwayland

, speechd

, speechd-minimal

, sqlite

, wrapQtAppsHook

, xdg-utils
@@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { 
      ] ++ lib.optional (unrarSupport) unrardll)

    )

    xdg-utils

  ] ++ lib.optional (speechSupport) speechd;

  ] ++ lib.optional (speechSupport) speechd-minimal;



  installPhase = ''

    runHook preInstall

pkgs/applications/networking/browsers/chromium/common.nix

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
, glib, gtk3, dbus-glib

, libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL

, mesa

, pciutils, protobuf, speechd, libXdamage, at-spi2-core

, pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core

, pipewire

, libva

, libdrm, wayland, libxkbcommon # Ozone
@@ -196,7 +196,7 @@ let 
      glib gtk3 dbus-glib

      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL

      mesa # required for libgbm

      pciutils protobuf speechd libXdamage at-spi2-core

      pciutils protobuf speechd-minimal libXdamage at-spi2-core

      pipewire

      libva

      libdrm wayland libxkbcommon
@@ -224,7 +224,7 @@ let 
      glib gtk3 dbus-glib

      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL

      mesa # required for libgbm

      pciutils protobuf speechd libXdamage at-spi2-core

      pciutils protobuf speechd-minimal libXdamage at-spi2-core

      pipewire

      libva

      libdrm wayland libxkbcommon

pkgs/applications/networking/browsers/firefox/wrapper.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
, pciutils

, sndio

, libjack2

, speechd

, speechd-minimal

, removeReferencesTo

}:
@@ -98,7 +98,7 @@ let 
            ++ lib.optional sndioSupport sndio

            ++ lib.optional jackSupport libjack2

            ++ lib.optional smartcardSupport opensc

            ++ lib.optional (cfg.speechSynthesisSupport or true) speechd

            ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal

            ++ pkcs11Modules

            ++ gtk_modules;

      gtk_modules = [ libcanberra-gtk3 ];