Merge pull request #81132 from cohei/init-cmigemo

This commit is contained in:
Gabriel Ebner 2020-09-10 08:50:20 +02:00 committed by GitHub
commit 1ccafcbb8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 66 additions and 0 deletions

View File

@ -1641,6 +1641,12 @@
githubId = 5561189;
name = "Cody Opel";
};
cohei = {
email = "a.d.xvii.kal.mai@gmail.com";
github = "cohei";
githubId = 3477497;
name = "TANIGUCHI Kohei";
};
cohencyril = {
email = "cyril.cohen@inria.fr";
github = "CohenCyril";

View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }:
stdenv.mkDerivation {
pname = "cmigemo";
version = "1.3e";
src = fetchFromGitHub {
owner = "koron";
repo = "cmigemo";
rev = "5c014a885972c77e67d0d17d367d05017c5873f7";
sha256 = "0xrblwhaf70m0knkd5584iahaq84rlk0926bhdsrzmakpw77hils";
};
nativeBuildInputs = [ gzip libiconv nkf perl which ];
postUnpack = ''
cp ${skk-dicts}/share/SKK-JISYO.L source/dict/
'';
patches = [ ./no-http-tool-check.patch ];
makeFlags = [ "INSTALL=install" ];
buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all";
installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ];
meta = with stdenv.lib; {
description = "A tool that supports Japanese incremental search with Romaji";
homepage = "https://www.kaoriya.net/software/cmigemo";
license = licenses.mit;
maintainers = [ maintainers.cohei ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,23 @@
diff --git a/configure b/configure
index 4480261..2fb9b34 100755
--- a/configure
+++ b/configure
@@ -28,18 +28,6 @@ do
esac
done
-# Check HTTP access tool
-if CHECK_COMMAND curl ; then
- PROGRAM_HTTP="curl -O"
-elif CHECK_COMMAND wget ; then
- PROGRAM_HTTP="wget"
-elif CHECK_COMMAND fetch ; then
- PROGRAM_HTTP="fetch"
-else
- echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)."
- exit 1
-fi
-
# Check encoding filter
if CHECK_COMMAND qkc ; then
PROGRAM_ENCODEFILTER="qkc -q -u"

View File

@ -2702,6 +2702,8 @@ in
citra = libsForQt5.callPackage ../misc/emulators/citra { };
cmigemo = callPackage ../tools/text/cmigemo { };
cmst = libsForQt5.callPackage ../tools/networking/cmst { };
cmt = callPackage ../applications/audio/cmt {};