Subject: [PATCH] Minor fixes to interception-tools and update dual-function-keys.

From: "Paul A. Patience" <[email-masked]>
Date: Sun, 11 Jul 2021 04:31:58 +0000

Empty Message

From 34e0d095c51cb37a10b338586446c48eec9c7bca Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <[email-masked]>
Date: Sun, 11 Jul 2021 00:08:39 -0400
Subject: [PATCH 1/3] gnu: interception-tools: Make minor fixes.

* gnu/packages/linux.scm (interception-tools)[inputs]: Move boost to...
[native-inputs]: ...here. New field.
[license]: gpl3+ -> gpl3.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fa9451aedc..817df615b1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3686,9 +3686,10 @@ devices that can inject events directly into the input subsystem.")
                (base32
                 "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj"))))
     (build-system cmake-build-system)
+    (native-inputs
+     `(("boost" ,boost)))
     (inputs
-     `(("boost" ,boost)
-       ("libevdev" ,libevdev)
+     `(("libevdev" ,libevdev)
        ("libudev" ,eudev)
        ("yaml-cpp" ,yaml-cpp)))
     (arguments
@@ -3714,9 +3715,9 @@ devices that can inject events directly into the input subsystem.")
 @item @command{uinput} --- redirect device input events from stding to virtual device
 @item @command{mux} --- mux streams of input events
 @end itemize")
-    ;; Dual-licensed under GPLv3+ or "something else" on request, per
+    ;; Dual-licensed under GPLv3 or "something else" on request, per
     ;; 'README.md'.
-    (license license:gpl3+)))
+    (license license:gpl3)))
 
 (define-public interception-dual-function-keys
   (package
-- 
2.32.0

From c324fef966098f885454f5afb0687db137d4c7d0 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <[email-masked]>
Date: Sun, 11 Jul 2021 00:22:46 -0400
Subject: [PATCH 3/3] gnu: interception-dual-function-keys: Update to 1.4.0.

* gnu/packages/linux.scm (interception-dual-function-keys)
[version]: Update to 1.4.0.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8fa723bc1a..6452da9f7b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3722,7 +3722,7 @@ devices that can inject events directly into the input subsystem.")
 (define-public interception-dual-function-keys
   (package
     (name "interception-dual-function-keys")
-    (version "1.3.0")
+    (version "1.4.0")
     (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys")
     (source (origin
               (method git-fetch)
@@ -3732,7 +3732,7 @@ devices that can inject events directly into the input subsystem.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz"))))
+                "0s49vbg3j4rwh78i8rx8qr7myql09p7b3lhrjl0p7dd98xp6ann6"))))
     (build-system gnu-build-system)
     (inputs
      `(("libevdev" ,libevdev)
-- 
2.32.0

From 83c06ca8d7b52c7dc7c38ed2c476ff39047f5cd2 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <[email-masked]>
Date: Sun, 11 Jul 2021 00:19:56 -0400
Subject: [PATCH 2/3] gnu: interception-dual-function-keys: Minor fixes.

* gnu/packages/linux.scm (interception-dual-function-keys)
[arguments]<#:make-flags>: Make use of cc-for-target, cxx-for-target and
%output.
<#:phases>{check}: Undelete phase. Disable tests instead with...
<#:tests?>: ...this. New field.
---
 gnu/packages/linux.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 817df615b1..8fa723bc1a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3738,8 +3738,9 @@ devices that can inject events directly into the input subsystem.")
      `(("libevdev" ,libevdev)
        ("yaml-cpp" ,yaml-cpp)))
     (arguments
-     `(#:make-flags (list "CC=gcc" "CXX=g++"
-                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
+     `(#:make-flags (list ,(string-append "CC=" (cc-for-target))
+                          ,(string-append "CXX=" (cxx-for-target))
+                          (string-append "PREFIX=" %output))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-libevdev-path
@@ -3750,9 +3751,9 @@ devices that can inject events directly into the input subsystem.")
                   (string-append libevdev "/include/libevdev-1.0")))
                #t)))
          ;; No configure script
-         (delete 'configure)
-         ;; No target 'check'
-         (delete 'check))))
+         (delete 'configure))
+       ;; No tests are included.
+       #:tests? #f))
     (synopsis "Tap for one key, hold for another")
     (description
      "Dual Function Keys is a plugin for @code{interception-tools} that allows
-- 
2.32.0