summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/inputmethods/ibus-engines
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-11 08:54:33 +0100
committerProfpatsch <mail@profpatsch.de>2021-01-11 10:38:22 +0100
commit4a7f99d55d299453a9c2397f90b33d1120669775 (patch)
tree9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/tools/inputmethods/ibus-engines
parente87aef06e00c42b26789321454d7bd609548cc12 (diff)
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/tools/inputmethods/ibus-engines')
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix4
-rw-r--r--pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix4
14 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 34d918cb7da7..ecc142ac16ce 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchurl
, gettext
, pkgconfig
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "IBus interface to the anthy input method";
homepage = "https://github.com/fujiwarat/ibus-anthy";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 18e878b47b5c..61ea12ff59b2 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchFromGitHub
, gettext
, xorg
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "A Vietnamese IME for IBus";
homepage = "https://github.com/BambooEngine/ibus-bamboo";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index f6ceece34e19..531aeb3d6643 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchurl
, substituteAll
, appstream-glib
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
]))
];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Ibus Hangul engine";
homepage = "https://github.com/choehwanjin/ibus-hangul";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 0b16b54ad48b..cdebf64d8629 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
, vala, intltool, pkgconfig
, libkkc, ibus, skk-dicts
, gtk3
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
ln -s ${skk-dicts}/share $out/share/skk
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "libkkc (Japanese Kana Kanji input method) engine for ibus";
homepage = "https://github.com/ueno/ibus-kkc";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 2c1d558f04d3..18cd2ec4ed83 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, gettext
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
db
];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "IBus interface to the libpinyin input method";
license = licenses.gpl2;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
index 9c5f2cefb517..1bb2479b4997 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
stdenv.mkDerivation rec {
pname = "ibus-libthai";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ibus libthai ];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
homepage = "https://linux.thai.net/projects/ibus-libthai";
description = "Thai input method engine for IBus";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 35e02d52b486..252fc2b286b6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, pkgconfig
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--with-gtk=3.0"
];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "m17n engine for ibus";
homepage = "https://github.com/ibus/ibus-m17n";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 695a45d81ffc..8964b1809897 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
+{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
name = "ibus-mozc-${version}";
version = "2.23.4206.102";
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
index 03a801abbeb0..d444d44f2337 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify
, librime, brise }:
stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
--replace '/usr' $out
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Rime input method engine for IBus";
homepage = "https://rime.im/";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 402013d8c5d4..40c33aff4011 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }:
+{ lib, stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }:
let
src = fetchFromGitHub {
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ibus ibus-table python3 ];
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Chinese tables for IBus-Table";
homepage = "https://github.com/definite/ibus-table-chinese";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index b74378f07934..0c7670fd250c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
+{ lib, stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
stdenv.mkDerivation rec {
pname = "ibus-table-others";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
rm -rf $HOME
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Various table-based input methods for IBus";
homepage = "https://github.com/moebiuscurve/ibus-table-others";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 831161df2b7b..f923c630d177 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobject-introspection
, ibus, python3, wrapGAppsHook }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
--replace "docbook2man" "docbook2man --sgml"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "An IBus framework for table-based input methods";
homepage = "https://github.com/kaio/ibus-table/wiki";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index cc0d12745b12..a8336e1d7950 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
, wrapGAppsHook, gobject-introspection
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib")
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://mike-fabian.github.io/ibus-typing-booster/";
license = licenses.gpl3Plus;
description = "A typing booster engine for the IBus platform";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 435d1154d4ad..38f746e3ceeb 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
, fetchFromGitHub
, gobject-introspection
, wrapGAppsHook
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
wrapGApp $out/share/ibus-uniemoji/uniemoji.py
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
isIbusEngine = true;
description = "Input method (ibus) for entering unicode symbols and emoji by name";
homepage = "https://github.com/salty-horse/ibus-uniemoji";