about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-06-06 21:27:34 -0400
committerGitHub <noreply@github.com>2018-06-06 21:27:34 -0400
commit6dcef7ab4630eca62791c11a738550b49e4557db (patch)
tree5ae9256533c6616f92ba199de9002eea8de424b0
parentd6a97a524a46d657c82cb4c0ad567ece9faac651 (diff)
parentbe170030b948c944192facc32613aa4282f7f7df (diff)
downloadnixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar.gz
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar.bz2
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar.lz
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar.xz
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.tar.zst
nixlib-6dcef7ab4630eca62791c11a738550b49e4557db.zip
Merge pull request #41568 from linc01n/fcitx-table-extra
fcitx-table-extra: init at 0.3.8
-rw-r--r--maintainers/maintainer-list.nix5
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix29
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 36 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fe5d3a1103d..a3db8129b0cc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2176,6 +2176,11 @@
     github = "limeytexan";
     name = "Michael Brantley";
   };
+  linc01n = {
+    email = "git@lincoln.hk";
+    github = "linc01n";
+    name = "Lincoln Lee";
+  };
   linquize = {
     email = "linquize@yahoo.com.hk";
     github = "linquize";
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
new file mode 100644
index 000000000000..918edf0240a5
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-table-extra-${version}";
+  version = "0.3.8";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz";
+    sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
+  };
+
+  buildInputs = [ cmake fcitx gettext ];
+
+  preInstall = ''
+   substituteInPlace tables/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-table-extra";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-table-extra/";
+    description   = "Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick";
+    license       = licenses.gpl2Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ linc01n ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50a932e23c99..a22fd19603f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2315,6 +2315,8 @@ with pkgs;
       protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
     };
 
+    table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { };
+
     table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
 
     cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { };