From 023f0060a68b31079f8f8bd4fef4e9cfb97bf798 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 15:01:48 +0000 Subject: [PATCH] cmigemo: fix cross --- pkgs/tools/text/cmigemo/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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") ];