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/ibus | |
| parent | 94f36839357387fd711d17d762d88c69767f265b (diff) | |
| download | nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.gz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.bz2 nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.lz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.xz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.zst nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.zip | |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/inputmethods/ibus')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/wrapper.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 32db4850391..e5f4aa5002d 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 1b14629d283..74426b2b04e 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" \ |