hunspell: refactor, to by-name and add withDicts helper (#397817)

pkgs/by-name/hu/hunspell/package.nix

···
   hardeningDisable = [ "format" ];
 
   passthru = {
+    withDicts = callPackage ./wrapper.nix { hunspell = finalAttrs.finalPackage; };
     tests = {
       pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
       version = testers.testVersion { package = finalAttrs.finalPackage; };
-      wrapper = callPackage ./wrapper.nix {
-        hunspell = finalAttrs.finalPackage;
-        dicts = [ hunspellDicts.en_US ];
-      };
+      wrapper = finalAttrs.finalPackage.withDicts (d: [ d.en_US ]);
     };
 
     updateScript = nix-update-script { };
···
     homepage = "http://hunspell.github.io/";
     changelog = "https://github.com/hunspell/hunspell/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [
-      gpl2
-      lgpl21
+      gpl2Plus
+      lgpl21Plus
       mpl11
     ];
-    maintainers = with lib.maintainers; [ getchoo ];
+    maintainers = with lib.maintainers; [
+      getchoo
+      RossSmyth
+    ];
     mainProgram = "hunspell";
     platforms = lib.platforms.all;
     pkgConfigModules = [ "hunspell" ];

pkgs/by-name/hu/hunspell/wrapper.nix

···
 {
-  stdenv,
   lib,
+  buildEnv,
   hunspell,
+  hunspellDicts,
   makeBinaryWrapper,
-  dicts ? [ ],
 }:
-let
-  searchPath = lib.makeSearchPath "share/hunspell" dicts;
-in
-stdenv.mkDerivation {
-  inherit (lib.appendToName "with-dicts" hunspell) name;
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+lib.makeOverridable (
+  { ... }@dicts:
+  f:
+  buildEnv {
+    inherit (lib.appendToName "with-dicts" hunspell) name;
 
-  buildCommand = ''
-    makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \
-      --prefix DICPATH : ${lib.escapeShellArg searchPath}
-  '';
+    paths = f dicts;
 
-  meta = {
-    inherit (hunspell.meta)
-      description
-      longDescription
-      homepage
-      changelog
-      license
-      maintainers
-      mainProgram
-      platforms
-      ;
-  };
-}
+    pathsToLink = [ "/share/hunspell" ];
+
+    nativeBuildInputs = [ makeBinaryWrapper ];
+
+    postBuild = ''
+      makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \
+        --prefix DICPATH : $out/share/hunspell
+    '';
+
+    meta = {
+      inherit (hunspell.meta)
+        description
+        longDescription
+        homepage
+        changelog
+        license
+        maintainers
+        mainProgram
+        platforms
+        ;
+    };
+  }
+) hunspellDicts

pkgs/by-name/on/onboard/package.nix

···
   gtk3,
   hunspell,
   hunspellDicts,
-  hunspellWithDicts,
   intltool,
   isocodes,
   libappindicator-gtk3,
···
 
 let
 
-  customHunspell = hunspellWithDicts [
-    hunspellDicts.en-us
-  ];
+  customHunspell = hunspell.withDicts (di: [ di.en-us ]);
 
   majorVersion = "1.4";
 
 in
-
 python3.pkgs.buildPythonApplication rec {
   pname = "onboard";
   version = "${majorVersion}.1";
···
   };
 
   patches = [
-    (replaceVars ./fix-paths.patch {
-      inherit mousetweaks;
-    })
+    (replaceVars ./fix-paths.patch { inherit mousetweaks; })
     # Allow loading hunspell dictionaries installed in NixOS system path
     ./hunspell-use-xdg-datadirs.patch
 
···
     systemd
   ];
 
-  propagatedUserEnvPkgs = [
-    dconf
-  ];
+  propagatedUserEnvPkgs = [ dconf ];
 
   nativeCheckInputs = [
     # for Onboard.SpellChecker.aspell_cmd doctests

pkgs/top-level/all-packages.nix

···
 
   hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
 
-  hunspellDicts = recurseIntoAttrs (
-    callPackages ../development/libraries/hunspell/dictionaries.nix { }
-  );
+  hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { });
 
   hunspellDictsChromium = recurseIntoAttrs (
-    callPackages ../development/libraries/hunspell/dictionaries-chromium.nix { }
+    callPackages ../by-name/hu/hunspell/dictionaries-chromium.nix { }
   );
 
-  hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; };
+  hunspellWithDicts =
+    dicts:
+    lib.warn "hunspellWithDicts is deprecated, please use hunspell.withDicts instead."
+      hunspell.withDicts
+      (_: dicts);
 
   hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_29; };