JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48686 from dtzWill/update/libinput-gestures-2.38

Browse Source 
libinput-gestures: 2.33 -> 2.38, fixup
This commit is contained in:
xeji 2018-10-23 22:30:41 +02:00 committed by GitHub
commit 3122976238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
diff --git a/libinput-gestures b/libinput-gestures diff --git a/libinput-gestures b/libinput-gestures
index f337ba3..fe56d66 100755 index 66479b6..aca94ac 100755
--- a/libinput-gestures --- a/libinput-gestures
+++ b/libinput-gestures +++ b/libinput-gestures
@@ -6,7 +6,7 @@ from collections import OrderedDict @@ -6,7 +6,7 @@ from collections import OrderedDict

34
pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
View File

@ -1,29 +1,28 @@
diff --git a/libinput-gestures b/libinput-gestures diff --git a/libinput-gestures b/libinput-gestures
index f337ba3..5f5b05d 100755 index aca94ac..c2f03ca 100755
--- a/libinput-gestures --- a/libinput-gestures
+++ b/libinput-gestures +++ b/libinput-gestures
@@ -75,17 +75,13 @@ def get_libinput_vers(): @@ -77,7 +77,7 @@ def get_libinput_vers():
'Return the libinput installed version number string' 'Return the libinput installed version number string'
# Try to use newer libinput interface then fall back to old # Try to use newer libinput interface then fall back to old
# (depreciated) interface. # (depreciated) interface.
- res = run(('libinput', '--version'), check=False) - res = run(('libinput', '--version'), check=False)
+ res = run(('@libinput@', '--version'), check=False) + res = run(('@libinput@', '--version'), check=False)
return res.strip() if res else run(('libinput-list-devices', '--version')) return res.strip() if res else \
run(('libinput-list-devices', '--version'), check=False)
# Libinput changed the way in which it's utilities are called @@ -87,8 +87,8 @@ if not libvers:
libvers = get_libinput_vers() sys.exit('libinput helper tools do not seem to be installed?')
-if Version(libvers) >= Version('1.8'):
if Version(libvers) >= Version('1.8'):
- cmd_debug_events = 'libinput debug-events' - cmd_debug_events = 'libinput debug-events'
- cmd_list_devices = 'libinput list-devices' - cmd_list_devices = 'libinput list-devices'
-else: + cmd_debug_events = '@libinput@ debug-events'
- cmd_debug_events = 'libinput-debug-events' + cmd_list_devices = '@libinput@ list-devices'
- cmd_list_devices = 'libinput-list-devices' else:
+cmd_debug_events = '@libinput@ debug-events' cmd_debug_events = 'libinput-debug-events'
+cmd_list_devices = '@libinput@ list-devices' cmd_list_devices = 'libinput-list-devices'
@@ -199,7 +199,7 @@ class COMMAND_internal(COMMAND):
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): def run(self):
'Get list of current workspaces and select next one' 'Get list of current workspaces and select next one'
@ -32,7 +31,7 @@ index f337ba3..5f5b05d 100755
if not stdout: if not stdout:
# This command can fail on GNOME when you have only a single # This command can fail on GNOME when you have only a single
# dynamic workspace using Xorg (probably a GNOME bug) so let's # dynamic workspace using Xorg (probably a GNOME bug) so let's
@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND): @@ -233,7 +233,7 @@ class COMMAND_internal(COMMAND):
# Switch to desired workspace # Switch to desired workspace
if index >= minindex and index < maxindex: if index >= minindex and index < maxindex:
@ -41,3 +40,6 @@ index f337ba3..5f5b05d 100755
# Table of gesture handlers # Table of gesture handlers
handlers = OrderedDict() handlers = OrderedDict()
--
2.19.1

7
pkgs/tools/inputmethods/libinput-gestures/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, { lib, stdenv, fetchFromGitHub, makeWrapper,
libinput, wmctrl, libinput, wmctrl, python3,
xdotool ? null, xdotool ? null,
extraUtilsPath ? lib.optional (xdotool != null) xdotool extraUtilsPath ? lib.optional (xdotool != null) xdotool
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libinput-gestures"; pname = "libinput-gestures";
version = "2.33"; version = "2.38";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bulletmark"; owner = "bulletmark";
repo = "libinput-gestures"; repo = "libinput-gestures";
rev = version; rev = version;
sha256 = "0a4zq880da1rn0mxn1sq4cp6zkw4bfslr0vjczkbj4immjrj422j"; sha256 = "1nxvlifag04v56grdwxc3l92kmf51c4w2lq42a3w76yc6p4nxw1m";
}; };
patches = [ patches = [
./0001-hardcode-name.patch ./0001-hardcode-name.patch
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ];
postPatch = postPatch =
'' ''