hunspellDicts.fr-any: link fr-moderne to fr_FR

Some packages like `ibus-engines.typing-booster` require the dictionary
`fr_FR.dic` to provide proper support for the french language.

Until now the hunspell package set of nixpkgs didn't provide this
dictionary. It has been recommended to use `fr-moderne` as base and link
`fr_FR.dic` from it as done by other distros such as ArchLinux.

See https://github.com/NixOS/nixpkgs/issues/46940#issuecomment-423684570

Fixes #46940
This commit is contained in:
Maximilian Bosch
2019-05-23 15:53:50 +02:00
parent de9c022ba0
commit a9d67d54b0
2 changed files with 15 additions and 1 deletions
@@ -156,6 +156,12 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem>
<para>
The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal>
which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>
@@ -20,6 +20,7 @@ let
# docs # docs
install -dm755 "$out/share/doc" install -dm755 "$out/share/doc"
install -m644 ${readmeFile} $out/share/doc/${name}.txt install -m644 ${readmeFile} $out/share/doc/${name}.txt
runHook postInstall
''; '';
} // args); } // args);
@@ -107,7 +108,7 @@ let
}; };
mkDictFromDicollecte = mkDictFromDicollecte =
{ shortName, shortDescription, longDescription, dictFileName }: { shortName, shortDescription, longDescription, dictFileName, isDefault ? false }:
mkDict rec { mkDict rec {
inherit dictFileName; inherit dictFileName;
version = "5.3"; version = "5.3";
@@ -131,6 +132,12 @@ let
unpackCmd = '' unpackCmd = ''
unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
''; '';
postInstall = stdenv.lib.optionalString isDefault ''
for ext in aff dic; do
ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext
ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext
done
'';
}; };
mkDictFromWordlist = mkDictFromWordlist =
@@ -483,6 +490,7 @@ in {
réformées, suivant la lente évolution de lorthographe actuelle. Ce réformées, suivant la lente évolution de lorthographe actuelle. Ce
dictionnaire contient les graphies les moins polémiques de la réforme. dictionnaire contient les graphies les moins polémiques de la réforme.
''; '';
isDefault = true;
}; };
fr-reforme1990 = mkDictFromDicollecte { fr-reforme1990 = mkDictFromDicollecte {