From 595a506c4ac481ee5d2c34dbe37342bb36d06127 Mon Sep 17 00:00:00 2001 From: Lincoln Lee Date: Wed, 6 Jun 2018 17:54:42 +0800 Subject: [PATCH 1/2] Add myself to maintainer list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e11e7edcc69..2e5a374a743 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"; From be170030b948c944192facc32613aa4282f7f7df Mon Sep 17 00:00:00 2001 From: Lincoln Lee Date: Wed, 6 Jun 2018 18:04:07 +0800 Subject: [PATCH 2/2] fcitx-table-extra: init at 0.3.8 --- .../fcitx-table-extra/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix 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 00000000000..918edf0240a --- /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 99c3324e067..56a88ea9001 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 { };