summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kvalheim <Andrew@Kvalhe.im>2022-06-30 07:27:38 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-07-03 12:18:18 +0000
commite67b541a3a62551e901f15731f4b69da73a7b8aa (patch)
treebd04e13b22a4c4dae39ac948ccb2b1c9b37f4656
parentMerge pull request #179547 from NixOS/backport-179477-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-179723-to-release-22.05.tar.gz
signal-desktop: revert "Allow overriding the spell checker language (#44456)"origin/backport-179723-to-release-22.05
This reverts commit 9ef1406a9918f3414d081563ba34084c5e187a58. Signal Desktop removed this functionality when changing spell checkers: - signalapp/Signal-Desktop@6a517e4ef94cd76bd31d94ea3aad7af8e1da0360 - signalapp/Signal-Desktop@4a8f5db0a49f67426237731245bebdcc75c2a5c0 (cherry picked from commit cb7ddc7f34db03b4fc479df592c85b7176c85db2)
-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 4bf0aa078883..4674af74a8cc 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 ]}
)