From be1f676cfafce0f694cc090061296cf21310df17 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 14:44:07 +0000 Subject: [PATCH] skk-dicts: fix cross --- pkgs/tools/inputmethods/skk/skk-dicts/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d165f404f6cb..ab4173283a38 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,14 +49,14 @@ 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