diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/inputmethods | |
parent | 94f36839357387fd711d17d762d88c69767f265b (diff) |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/inputmethods')
22 files changed, 63 insertions, 63 deletions
diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 95f322ed8c68e..01f312fa63d67 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evscript"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; verifyCargoDeps = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; license = licenses.unlicense; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 180dc302ca0c4..6d8ed7d5ca92c 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp ${dicts} src/module/spell/dict/$(stripHash ${dicts}) cp ${table} src/im/table/data/$(stripHash ${table}) '' - + stdenv.lib.optionalString withPinyin '' + + lib.optionalString withPinyin '' cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data}) cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data}) cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data}) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 5fa85064fa3f8..b3dd2260d1cfe 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , pkg-config @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { libxkbfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Next generation of fcitx"; homepage = "https://github.com/fcitx/fcitx5"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 2b8a07537b0bd..b5955be3cb0af 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , fetchFromGitHub @@ -64,9 +64,9 @@ mkDerivation rec { opencc qtwebengine fmt - ] ++ stdenv.lib.optional luaSupport fcitx5-lua; + ] ++ lib.optional luaSupport fcitx5-lua; - meta = with stdenv.lib; { + meta = with lib; { description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index e5b55c26cd4b1..92563e8901319 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -45,12 +45,12 @@ mkDerivation rec { xkeyboardconfig libxkbfile libXdmcp - ] ++ stdenv.lib.optionals kcmSupport [ + ] ++ lib.optionals kcmSupport [ kdeclarative kwidgetsaddons ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration Tool for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-configtool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index ce157f7925355..f153c238c5390 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" - ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; + ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ gtk3 @@ -54,14 +54,14 @@ stdenv.mkDerivation rec { dbus at-spi2-core libXtst - ] ++ stdenv.lib.optional withGTK2 gtk2; + ] ++ lib.optional withGTK2 gtk2; nativeBuildInputs = [ cmake extra-cmake-modules ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 gtk im module and glib based dbus client library"; homepage = "https://github.com/fcitx/fcitx5-gtk"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 310cae035ba7b..3a11e6f319d85 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lua support for Fcitx 5"; homepage = "https://github.com/fcitx/fcitx5-lua"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 580082096ece8..e049930488993 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -36,7 +36,7 @@ mkDerivation rec { libXdmcp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 Qt Library"; homepage = "https://github.com/fcitx/fcitx5-qt"; license = with licenses; [ lgpl21Plus bsd3 ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 9992e19875893..ebbee817998f3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , pkgconfig @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { librime ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RIME support for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-rime"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 7dcca7e130d0c..3415ed40345c0 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; homepage = "https://github.com/fcitx/fcitx5-table-extra"; license = licenses.gpl2Only; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index eb9d93d6e7ce7..f595713571896 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Some other tables for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-table-other"; license = licenses.gpl3Only; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8964b18098971..405861e308f2e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { postUnpack = '' rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 32db48503919c..e5f4aa5002dcf 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchurl , fetchFromGitHub @@ -36,7 +36,7 @@ assert withWayland -> wayland != null && libxkbcommon != null; -with stdenv.lib; +with lib; let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 1b14629d2830c..74426b2b04ed1 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,9 +1,9 @@ -{ stdenv, runCommand, makeWrapper, lndir +{ lib, stdenv, runCommand, makeWrapper, lndir , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: let - name = "ibus-with-plugins-" + stdenv.lib.getVersion ibus; + name = "ibus-with-plugins-" + lib.getVersion ibus; env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 39a28214fe20c..043afe5a499d8 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, +{ lib, stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, libevdev, udev }: let @@ -26,8 +26,8 @@ in stdenv.mkDerivation { meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vyp ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.vyp ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 1abd84608454c..7feb14080e9f9 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "m17n-db-1.8.0"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; - configureFlags = stdenv.lib.optional (stdenv ? glibc) + configureFlags = lib.optional (stdenv ? glibc) "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps" ; meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index f7bff50920516..51e52ce4e953c 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m17n_db}: +{lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { name = "m17n-lib-1.8.0"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 7703de957167a..f4d276e0a61dd 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXaw, freetype }: +{ lib, stdenv, fetchurl, libXaw, freetype }: stdenv.mkDerivation rec { name = "libotf-0.9.16"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 4d2f37b865db3..c7a42e5a82c12 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, skktools }: +{ lib, stdenv, fetchurl, libiconv, skktools }: let # kana to kanji @@ -31,7 +31,7 @@ stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; phases = [ "installPhase" ]; installPhase = '' @@ -66,8 +66,8 @@ stdenv.mkDerivation { dictionaries for the SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index b150521396c32..2c97547488e92 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: # Note (2017-10-24, yuriaisaka): # - Version 1.3.3 dates from Jul. 19, 2013. @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "skktools-${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { input method. ''; homepage = "https://github.com/skk-dev/skktools"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 6bda390dc4aa4..d2bd7a14663ba 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: +{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: stdenv.mkDerivation rec { pname = "touchegg"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index f7ee905b9eee3..b58f1fe70a084 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -18,7 +18,7 @@ , withMisc ? false, libeb ? null }: -with stdenv.lib; +with lib; assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; |