hunspell: refactor, to by-name and add withDicts helper (#397817) (35577069) · Commits · nix / nixpkgs

pkgs/development/libraries/hunspell/dictionaries-chromium.nix→pkgs/by-name/hu/hunspell/dictionaries-chromium.nix

+0 −0

File moved.

+0 −0

File moved.

+8 −7

Original line number	Diff line number	Diff line
		@@ -58,13 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
		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 { };
		@@ -95,11 +93,14 @@ stdenv.mkDerivation (finalAttrs: {
		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" ];

+0 −0

File moved.

+31 −25

Original line number	Diff line number	Diff line
		{
		stdenv,
		lib,
		buildEnv,
		hunspell,
		hunspellDicts,
		makeBinaryWrapper,
		dicts ? [ ],
		}:
		let
		searchPath = lib.makeSearchPath "share/hunspell" dicts;
		in
		stdenv.mkDerivation {

		lib.makeOverridable (
		{ ... }@dicts:
		f:
		buildEnv {
		inherit (lib.appendToName "with-dicts" hunspell) name;

		paths = f dicts;

		pathsToLink = [ "/share/hunspell" ];

		nativeBuildInputs = [ makeBinaryWrapper ];

		buildCommand = ''
		postBuild = ''
		makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \
		--prefix DICPATH : ${lib.escapeShellArg searchPath}
		--prefix DICPATH : $out/share/hunspell
		'';

		meta = {
		@@ -31,3 +36,4 @@ stdenv.mkDerivation {
		;
		};
		}
		) hunspellDicts