diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
| commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
| tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/tools/inputmethods/fcitx | |
| parent | e87aef06e00c42b26789321454d7bd609548cc12 (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/fcitx')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/unwrapped.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 1fd6f2daf2eb9..6e0c48d0610c6 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK-based config tool for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 99a92a95060a6..180dc302ca0c4 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext +{ lib, stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { "-DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fcitx/fcitx"; description = "A Flexible Input Method Framework"; license = licenses.gpl2; |