git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145639 from alyssais/cmigemo
commitbe53e0d5069735f5f63a6bd40b6b237bdd9ba957 authorSandro <sandro.jaeckel@gmail.com> dateFri 12 Nov 2021, 23:51 (5 years ago) parent1a270c8023f006
2 files changed+21−10
pkgs/tools/inputmethods/skk/skk-dicts/default.nix+12−8 pkgs/tools/text/cmigemo/default.nix+9−2
pkgs/tools/inputmethods/skk/skk-dicts/default.nix+12−8
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libiconv, skktools }:
1+{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }:
22
33let
44 # kana to kanji
@@ -33,6 +33,8 @@ stdenv.mkDerivation {
3333 srcs = [ small medium large edict assoc ];
3434 nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;
3535
36+ strictDeps = true;
37+
3638 dontUnpack = true;
3739
3840 installPhase = ''
@@ -47,28 +49,30 @@ stdenv.mkDerivation {
4749 for src in $srcs; do
4850 dst=$out/share/$(dictname $src)
4951 echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line
50− iconv -f EUC-JP -t UTF-8 $src |\
51− ${skktools}/bin/skkdic-expr2 >> $dst
52+ ${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \
53+ -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst
5254 done
5355
5456 # combine .L .edict and .assoc for convenience
5557 dst=$out/share/SKK-JISYO.combined
5658 echo ";;; -*- coding: utf-8 -*-" > $dst
57− ${skktools}/bin/skkdic-expr2 \
59+ skkdic-expr2 \
5860 $out/share/$(dictname ${large}) + \
5961 $out/share/$(dictname ${edict}) + \
6062 $out/share/$(dictname ${assoc}) >> $dst
6163 '';
6264
63− meta = {
65+ enableParallelBuilding = true;
66+
67+ meta = with lib; {
6468 description = "A collection of standard SKK dictionaries";
6569 longDescription = ''
6670 This package provides a collection of standard kana-to-kanji
6771 dictionaries for the SKK Japanese input method.
6872 '';
6973 homepage = "https://github.com/skk-dev/dict";
70− license = lib.licenses.gpl2Plus;
71− maintainers = with lib.maintainers; [ yuriaisaka ];
72− platforms = with lib.platforms; linux ++ darwin;
74+ license = licenses.gpl2Plus;
75+ maintainers = with maintainers; [ yuriaisaka ];
76+ platforms = platforms.all;
7377 };
7478}
pkgs/tools/text/cmigemo/default.nix+9−2
@@ -1,4 +1,7 @@
1−{ lib, stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }:
1+{ lib, stdenv, fetchFromGitHub, fetchurl, buildPackages
2+, gzip, libiconv, nkf, perl, which
3+, skk-dicts
4+}:
25
36stdenv.mkDerivation {
47 pname = "cmigemo";
@@ -21,7 +24,11 @@ stdenv.mkDerivation {
2124
2225 makeFlags = [ "INSTALL=install" ];
2326
24− buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all";
27+ preBuild = ''
28+ makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932")
29+ '';
30+
31+ buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ];
2532
2633 installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ];
2734