diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-07-04 14:27:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-04 14:27:02 +0200 |
| commit | 814851ed804417f1db1ceea187e9f72354dcd27f (patch) | |
| tree | 4ae7a38778731f3104e15c4ba6879c03ee071e4d | |
| parent | Merge pull request #180110 from NixOS/backport-180076-to-release-22.05 (diff) | |
| parent | signal-desktop: revert "Allow overriding the spell checker language (#44456)" (diff) | |
| download | nixpkgs-814851ed804417f1db1ceea187e9f72354dcd27f.tar.gz | |
Merge pull request #180002 from NixOS/backport-179723-to-release-22.05
[Backport release-22.05] signal-desktop: revert “Allow overriding the spell checker language”
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-desktop/default.nix | 18 |
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 cf30841ac9e7..d80df9a318f0 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. @@ -123,7 +108,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 ]} ) |