From c88d1114ed1344d10e21597a8f15d656fda6663a Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 15 Apr 2025 01:32:02 +0300 Subject: [PATCH] {discord,vesktop}: Add `NIXOS_SPEECH` variable to allow turning off speech without rebuilding It's on by default and launches 6 processes I wrote this before realizing that discord is unfree and has to be built always anyway. For vesktop the variable will be useful since it has to built, however for the sake of consistency let's add it for discord too. --- .../networking/instant-messengers/discord/linux.nix | 5 ++++- pkgs/by-name/ve/vesktop/package.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index ef77a66f3bb4..bf94609409a8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -173,7 +173,10 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 9ceee9d8fff6..2a78c7be03b1 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -139,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ - ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''