about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/signal-desktop
diff options
context:
space:
mode:
authorAndrew Kvalheim <Andrew@Kvalhe.im>2022-06-30 07:27:38 -0700
committerAndrew Kvalheim <Andrew@Kvalhe.im>2022-06-30 08:34:29 -0700
commitcb7ddc7f34db03b4fc479df592c85b7176c85db2 (patch)
treeef63db7b8bf661ea11c880593fa11c76c2821959 /pkgs/applications/networking/instant-messengers/signal-desktop
parenta8c2879f43db911e91ee74d8efe3a11a06e7e839 (diff)
signal-desktop: revert "Allow overriding the spell checker language (#44456)"
This reverts commit 9ef1406a9918f3414d081563ba34084c5e187a58.

Signal Desktop removed this functionality when changing spell checkers:

  - signalapp/Signal-Desktop@6a517e4ef94cd76bd31d94ea3aad7af8e1da0360
  - signalapp/Signal-Desktop@4a8f5db0a49f67426237731245bebdcc75c2a5c0
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/signal-desktop')
-rw-r--r--pkgs/applications/networking/instant-messengers/signal-desktop/default.nix18
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 7d18a8d29252f..d23cba8c97d19 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -5,24 +5,9 @@
 , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa
 # Runtime dependencies:
 , systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils
-# Unfortunately this also overwrites the UI language (not just the spell
-# checking language!):
-, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
-# For a full list of available languages:
-# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }'
 }:
 
-let
-  customLanguageWrapperArgs = (with lib;
-    let
-      # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict)
-      spellLangComponents = splitString "_" spellcheckerLanguage;
-      hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1);
-    in lib.optionalString (spellcheckerLanguage != null) ''
-      --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
-      --set LC_MESSAGES "${spellcheckerLanguage}"'');
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "signal-desktop";
   version = "5.47.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
@@ -122,7 +107,6 @@ in stdenv.mkDerivation rec {
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
-      ${customLanguageWrapperArgs}
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
     )