[bug#46066] [PATCH 1/2] gnu: Add interception-tools.

[bug#46066] [PATCH 1/2] gnu: Add interception-tools.

[Joseph LaFreniere]

[-- Attachment #1: Type: text/plain, Size: 43 bytes --]

Patch file attached.

--
Joseph LaFreniere

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-interception-tools.patch --]
[-- Type: text/x-patch, Size: 2569 bytes --]

From 8eb7d142df5da842a98ade989ff14c625e51e8d9 Mon Sep 17 00:00:00 2001
From: Joseph LaFreniere <joseph@lafreniere.xyz>
Date: Sat, 23 Jan 2021 14:57:25 -0600
Subject: [PATCH 1/2] gnu: Add interception-tools.

* gnu/packages/linux.scm (interception-tools): New variable.
---
 gnu/packages/linux.scm | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e0f056aff9..4112e9a00e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3463,6 +3463,51 @@ subsystem.  @code{uinput} allows userspace programs to create and handle input
 devices that can inject events directly into the input subsystem.")
     (license license:bsd-3)))
 
+(define-public interception-tools
+  (package
+    (name "interception-tools")
+    (version "0.6.4")
+    (home-page "https://gitlab.com/interception/linux/tools")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "121jy40ynkbzlqnx7g0dqwvkb7dm2ahcy6vwrz6ylsyd0jmi6s5a"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("libevdev" ,libevdev)
+       ("libudev" ,eudev)
+       ("yaml-cpp" ,yaml-cpp)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-libevdev-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((libevdev (assoc-ref inputs "libevdev")))
+               (substitute* "CMakeLists.txt"
+                 (("/usr/include/libevdev-1.0")
+                  (string-append libevdev "/include/libevdev-1.0")))
+               #t))))
+       ;; No tests are included.
+       #:tests? #f))
+    (synopsis "Utilities for operating on input events of evdev devices")
+    (description
+     "Interception Tools provides a composable infrastructure on top of
+@code{libudev} and @code{libevdev}.  The following utilities are provided:
+
+@itemize
+@item udevmon - monitor input devices for launching tasks
+@item intercept - redirect device input events to stdout
+@item uinput - redirect device input events from stding to virtual device
+@item mux - mux streams of input events
+@end itemize")
+    (license (list license:gpl3 (license:non-copyleft "file://README.md")))))
+
 (define-public lvm2
   (package
     (name "lvm2")
-- 
2.30.0

[bug#46066] [PATCH 2/2] gnu: Add interception-dual-function-keys.

[Joseph LaFreniere]

[-- Attachment #1: Type: text/plain, Size: 21 bytes --]

--
Joseph LaFreniere

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-interception-dual-function-keys.patch --]
[-- Type: text/x-patch, Size: 2407 bytes --]

From cce20f62028619ad565997a495c10507f874e95e Mon Sep 17 00:00:00 2001
From: Joseph LaFreniere <joseph@lafreniere.xyz>
Date: Sat, 23 Jan 2021 16:13:27 -0600
Subject: [PATCH 2/2] gnu: Add interception-dual-function-keys.

* gnu/packages/linux.scm (interception-dual-function-keys): New variable.
---
 gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4112e9a00e..c22645408d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3508,6 +3508,46 @@ devices that can inject events directly into the input subsystem.")
 @end itemize")
     (license (list license:gpl3 (license:non-copyleft "file://README.md")))))
 
+(define-public interception-dual-function-keys
+  (package
+    (name "interception-dual-function-keys")
+    (version "1.3.0")
+    (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libevdev" ,libevdev)
+       ("yaml-cpp" ,yaml-cpp)))
+    (arguments
+     `(#:make-flags (list "CC=gcc" "CXX=g++"
+                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-libevdev-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((libevdev (assoc-ref inputs "libevdev")))
+               (substitute* "config.mk"
+                 (("/usr/include/libevdev-1.0")
+                  (string-append libevdev "/include/libevdev-1.0")))
+               #t)))
+         ;; No configure script
+         (delete 'configure)
+         ;; No target 'check'
+         (delete 'check))))
+    (synopsis "Tap for one key, hold for another")
+    (description
+     "Dual Function Keys is a plugin for @code{interception-tools} that allows
+one to send arbitrary keycodes when a given key is tapped or held.")
+    (license license:expat)))
+
 (define-public lvm2
   (package
     (name "lvm2")
-- 
2.30.0


[-- Attachment #3: Type: text/plain, Size: 82 bytes --]

Date: Sat, 23 Jan 2021 21:20:50 -0600
Message-ID: <87mtwzt3zh.fsf@lafreniere.xyz>

bug#46066: [PATCH 1/2] gnu: Add interception-tools.

[Ludovic Courtès]

Joseph LaFreniere <joseph@lafreniere.xyz> skribis:

>>From cce20f62028619ad565997a495c10507f874e95e Mon Sep 17 00:00:00 2001
> From: Joseph LaFreniere <joseph@lafreniere.xyz>
> Date: Sat, 23 Jan 2021 16:13:27 -0600
> Subject: [PATCH 2/2] gnu: Add interception-dual-function-keys.
>
> * gnu/packages/linux.scm (interception-dual-function-keys): New variable.

Pushed as well, thanks!

[bug#46066] [PATCH 1/2] gnu: Add interception-tools.

[Ludovic Courtès]

Hi,

Joseph LaFreniere <joseph@lafreniere.xyz> skribis:

>>From 8eb7d142df5da842a98ade989ff14c625e51e8d9 Mon Sep 17 00:00:00 2001
> From: Joseph LaFreniere <joseph@lafreniere.xyz>
> Date: Sat, 23 Jan 2021 14:57:25 -0600
> Subject: [PATCH 1/2] gnu: Add interception-tools.
>
> * gnu/packages/linux.scm (interception-tools): New variable.

It fell through the cracks but now it’s pushed!

> +    (license (list license:gpl3 (license:non-copyleft "file://README.md")))))

I changed that to just gpl3+; ‘README.md’ describes some hypothetical
dual licensing, which I’ve mentioned in a comment.

Thanks,
Ludo’.