From 6b72fd5c3bb220788b1912a7ad4d08159d3744d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Oct 2020 18:06:04 +0100 Subject: [PATCH 1/4] libdatrie: init at 0.2.12 --- .../libraries/libdatrie/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libdatrie/default.nix diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix new file mode 100644 index 000000000000..0d3faf69e3b7 --- /dev/null +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }: + +stdenv.mkDerivation rec { + pname = "libdatrie"; + version = "0.2.12"; + + src = fetchurl { + url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz"; + sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + + postInstall = '' + installManPage man/trietool.1 + ''; + + meta = with stdenv.lib;{ + homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; + description = "This is an implementation of double-array structure for representing trie"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5facef8271..8a8343b990d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13500,6 +13500,8 @@ in libdap = callPackage ../development/libraries/libdap { }; + libdatrie = callPackage ../development/libraries/libdatrie { }; + libdazzle = callPackage ../development/libraries/libdazzle { }; libdbi = callPackage ../development/libraries/libdbi { }; From e0e37f42612c90144ab441f0fd7191271a8e4838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Oct 2020 18:06:48 +0100 Subject: [PATCH 2/4] libthai: init at 0.1.28 --- .../development/libraries/libthai/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libthai/default.nix diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix new file mode 100644 index 000000000000..6179ad0f6bda --- /dev/null +++ b/pkgs/development/libraries/libthai/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: + +stdenv.mkDerivation rec { + pname = "libthai"; + version = "0.1.28"; + + src = fetchurl { + url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; + sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ libdatrie ]; + + postInstall = '' + installManPage man/man3/*.3 + ''; + + meta = with stdenv.lib; { + homepage = "https://linux.thai.net/projects/libthai/"; + description = "Set of Thai language support routines"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a8343b990d4..b755b1edfe0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14218,6 +14218,8 @@ in libtcod = callPackage ../development/libraries/libtcod { }; + libthai = callPackage ../development/libraries/libthai { }; + libtheora = callPackage ../development/libraries/libtheora { }; libthreadar = callPackage ../development/libraries/libthreadar { }; From 0b884cec25bdf211f9f687e0945dbd0da363f1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Oct 2020 21:31:24 +0100 Subject: [PATCH 3/4] ibus-engines.libthai: init at 0.1.4 --- .../ibus-engines/ibus-libthai/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix new file mode 100644 index 000000000000..9c5f2cefb517 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }: + +stdenv.mkDerivation rec { + pname = "ibus-libthai"; + version = "0.1.4"; + + src = fetchurl { + url = "https://linux.thai.net/pub/ThaiLinux/software/libthai/ibus-libthai-${version}.tar.xz"; + sha256 = "0iam7308rxkx2xwaabc5wyj7vrxgd4cr95pvwrkm8fr9gh2xnwgv"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ibus libthai ]; + + meta = with stdenv.lib; { + isIbusEngine = true; + homepage = "https://linux.thai.net/projects/ibus-libthai"; + description = "Thai input method engine for IBus"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b755b1edfe0c..9bc2812f7cc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2876,6 +2876,8 @@ in libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; + libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { From dfe9e0e4584de3392311947053100898aea92cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Oct 2020 00:53:42 +0100 Subject: [PATCH 4/4] pango: build with libthai --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index eec30d16b8cc..b3dd2062ca0b 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz -, libintl, gobject-introspection, darwin, fribidi, gnome3 +, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib , x11Support? !stdenv.isDarwin, libXft @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ fribidi + libthai ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon @@ -39,7 +40,6 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - "-Dlibthai=disabled" # Not packaged in Nixpkgs ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dxft=disabled" # only works with x11 ];