From 530a50b4bff977b040ffbe4d4a34906c18ed356e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 12 Jul 2026 13:18:20 +0200 Subject: [PATCH] rstudio: fix build with ru-ru-mozilla dict --- pkgs/by-name/rs/rstudio/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 712c82014729..853211adfe8b 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -73,7 +73,13 @@ let # -large versions in case of clashes largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; otherDicts = lib.filter ( - d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts)) + d: + !( + lib.hasInfix "ru-ru-libreoffice" d.name # conflits with ru-ru-mozilla + || ( + lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (lib.map (d: d.dictFileName) largeDicts) + ) + ) ) hunspellDictionaries; dictionaries = largeDicts ++ otherDicts;