gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #146521 from midchildan/fix/cmigemo-darwin

Browse Source
This commit is contained in:
Ben Siraphob
2021-11-19 00:02:24 -06:00
committed by GitHub
parent d9e8a587e1 5f8dc66f42
commit 28b46d97ff
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+3 -1
View File
@@ -25,6 +25,8 @@ let
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc";
sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v";
};
iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc;
in
stdenv.mkDerivation {
@@ -49,7 +51,7 @@ stdenv.mkDerivation {
for src in $srcs; do
dst=$out/share/$(dictname $src)
echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line
${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \
${lib.getBin iconvBin}/bin/iconv \
-f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst
done
pkgs/tools/text/cmigemo/default.nix
+4 -1
View File
@@ -3,6 +3,9 @@
, skk-dicts
}:
let
iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc;
in
stdenv.mkDerivation {
pname = "cmigemo";
version = "1.3e";
@@ -25,7 +28,7 @@ stdenv.mkDerivation {
makeFlags = [ "INSTALL=install" ];
preBuild = ''
makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932")
makeFlagsArray+=(FILTER_UTF8="${lib.getBin iconvBin}/bin/iconv -t utf-8 -f cp932")
'';
buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ];