Merge branch 'master'

pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }:
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-rime-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
   };
 
-  buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ];
+  buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ];
 
   # cmake cannont automatically find our nonstandard brise install location
   cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ];

pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ];
+  propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ];
 
   nativeBuildInputs = [ python3Packages.wrapPython ];
 

pkgs/tools/inputmethods/ibus/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
 , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
-, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true
+, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
 , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
 
 assert withWayland -> wayland != null && libxkbcommon != null;
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     substituteInPlace data/dconf/Makefile.am --replace "dconf update" true
     substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus
     echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh
-    cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make .
+    cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
   '';
 
   preAutoreconf = "touch ChangeLog";
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     gconf
-    gtk_doc
+    gtk-doc
     intltool
     makeWrapper
     pkgconfig
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     gtk2
     gtk3
     isocodes
-    json_glib
+    json-glib
     libnotify
   ] ++ optionals withWayland [
     libxkbcommon

pkgs/tools/inputmethods/ibus/wrapper.nix

@@ -1,5 +1,5 @@
 { stdenv, runCommand, makeWrapper, lndir
-, dconf, hicolor_icon_theme, ibus, librsvg, plugins
+, dconf, hicolor-icon-theme, ibus, librsvg, plugins
 }:
 
 let
@@ -7,7 +7,7 @@ let
   env = {
     buildInputs = [ ibus ] ++ plugins;
     nativeBuildInputs = [ lndir makeWrapper ];
-    propagatedUserEnvPackages = [ hicolor_icon_theme ];
+    propagatedUserEnvPackages = [ hicolor-icon-theme ];
     paths = [ ibus ] ++ plugins;
     inherit (ibus) meta;
   };
@@ -37,7 +37,7 @@ let
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
           --prefix PYTHONPATH : "$PYTHONPATH" \
           --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
+          --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
     done
 
     for prog in ibus-daemon; do
@@ -56,7 +56,7 @@ let
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
           --prefix PYTHONPATH : "$PYTHONPATH" \
           --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
           --add-flags "--cache=refresh"
     done
   '';

pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch

@@ -0,0 +1,13 @@
+diff --git a/libinput-gestures b/libinput-gestures
+index f337ba3..fe56d66 100755
+--- a/libinput-gestures
++++ b/libinput-gestures
+@@ -6,7 +6,7 @@ from collections import OrderedDict
+ from pathlib import Path
+ from distutils.version import LooseVersion as Version
+ 
+-PROG = Path(sys.argv[0]).stem
++PROG = "libinput-gestures"
+ 
+ # Conf file containing gesture commands.
+ # Search first for user file then system file.

pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch

@@ -0,0 +1,43 @@
+diff --git a/libinput-gestures b/libinput-gestures
+index f337ba3..5f5b05d 100755
+--- a/libinput-gestures
++++ b/libinput-gestures
+@@ -75,17 +75,13 @@ def get_libinput_vers():
+     'Return the libinput installed version number string'
+     # Try to use newer libinput interface then fall back to old
+     # (depreciated) interface.
+-    res = run(('libinput', '--version'), check=False)
++    res = run(('@libinput@', '--version'), check=False)
+     return res.strip() if res else run(('libinput-list-devices', '--version'))
+ 
+ # Libinput changed the way in which it's utilities are called
+ libvers = get_libinput_vers()
+-if Version(libvers) >= Version('1.8'):
+-    cmd_debug_events = 'libinput debug-events'
+-    cmd_list_devices = 'libinput list-devices'
+-else:
+-    cmd_debug_events = 'libinput-debug-events'
+-    cmd_list_devices = 'libinput-list-devices'
++cmd_debug_events = '@libinput@ debug-events'
++cmd_list_devices = '@libinput@ list-devices'
+ 
+ def get_devices_list():
+     'Get list of devices and their attributes (as a dict) from libinput'
+@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND):
+ 
+     def run(self):
+         'Get list of current workspaces and select next one'
+-        stdout = run(('wmctrl', '-d'), check=False)
++        stdout = run(('@wmctrl@', '-d'), check=False)
+         if not stdout:
+             # This command can fail on GNOME when you have only a single
+             # dynamic workspace using Xorg (probably a GNOME bug) so let's
+@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND):
+ 
+         # Switch to desired workspace
+         if index >= minindex and index < maxindex:
+-            run(('wmctrl', '-s', str(index)))
++            run(('@wmctrl@', '-s', str(index)))
+ 
+ # Table of gesture handlers
+ handlers = OrderedDict()

pkgs/tools/inputmethods/libinput-gestures/default.nix

@@ -0,0 +1,54 @@
+{ lib, stdenv, fetchFromGitHub, makeWrapper,
+  libinput, wmctrl,
+  xdotool ? null,
+  extraUtilsPath ? lib.optional (xdotool != null) xdotool
+}:
+stdenv.mkDerivation rec {
+  pname = "libinput-gestures";
+  version = "2.32";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "bulletmark";
+    repo = "libinput-gestures";
+    rev = version;
+    sha256 = "1by6sabx0s8sd9w5675gc26q7yccxnxxsjg4dqlb6nbs0vcg81s7";
+  };
+  patches = [
+    ./0001-hardcode-name.patch
+    ./0002-paths.patch
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postPatch =
+    ''
+      substituteInPlace libinput-gestures-setup --replace /usr/ /
+
+      substituteInPlace libinput-gestures \
+        --replace      /etc     "$out/etc" \
+        --subst-var-by libinput "${libinput}/bin/libinput" \
+        --subst-var-by wmctrl   "${wmctrl}/bin/wmctrl"
+    '';
+  installPhase =
+    ''
+      runHook preInstall
+      ${stdenv.shell} libinput-gestures-setup -d "$out" install
+      runHook postInstall
+    '';
+  postFixup =
+    ''
+      rm "$out/bin/libinput-gestures-setup"
+      substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
+      chmod +x "$out/share/applications/libinput-gestures.desktop"
+      wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}"
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bulletmark/libinput-gestures;
+    description = "Gesture mapper for libinput";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ teozkr ];
+  };
+}