diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d165f404f6cb..385806e444c0 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv, skktools }: +{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }: let # kana to kanji @@ -33,6 +33,8 @@ stdenv.mkDerivation { srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; + strictDeps = true; + dontUnpack = true; installPhase = '' @@ -47,28 +49,30 @@ stdenv.mkDerivation { for src in $srcs; do dst=$out/share/$(dictname $src) echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - iconv -f EUC-JP -t UTF-8 $src |\ - ${skktools}/bin/skkdic-expr2 >> $dst + ${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \ + -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst done # combine .L .edict and .assoc for convenience dst=$out/share/SKK-JISYO.combined echo ";;; -*- coding: utf-8 -*-" > $dst - ${skktools}/bin/skkdic-expr2 \ + skkdic-expr2 \ $out/share/$(dictname ${large}) + \ $out/share/$(dictname ${edict}) + \ $out/share/$(dictname ${assoc}) >> $dst ''; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "A collection of standard SKK dictionaries"; longDescription = '' This package provides a collection of standard kana-to-kanji dictionaries for the SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ yuriaisaka ]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ yuriaisaka ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 6787d68991d3..3562d40bc3e3 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, buildPackages +, gzip, libiconv, nkf, perl, which +, skk-dicts +}: stdenv.mkDerivation { pname = "cmigemo"; @@ -21,7 +24,11 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; - buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all"; + preBuild = '' + makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932") + ''; + + buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ];