gnu: usbguard: Remove input labels.

* gnu/packages/hardware.scm (usbguard)[native-inputs, inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE and remove trailing #t's.

1 files changed, 26 insertions, 29 deletions

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 8d8947e3c5..0764818f6a 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -837,7 +837,7 @@ applications.")
                (base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     '(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-bootstrap-script
            (lambda _
@@ -849,19 +849,17 @@ applications.")
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "configure"
                (("/usr/include/catch")
-                (string-append (assoc-ref inputs "catch") "/include")))
+                (dirname (search-input-file inputs "include/catch.hpp"))))
              ;; Do not create log directory.
              (substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
              ;; Disable LDAP tests: they use 'sudo'.
              (substitute* "src/Tests/Makefile.in"
-               (("\\$\\(am__append_2\\)") ""))
-             #t))
+               (("\\$\\(am__append_2\\)") ""))))
          (add-after 'install 'delete-static-library
            (lambda* (#:key outputs #:allow-other-keys)
              ;; It can't be direclty disabled since it's needed for the tests.
              (delete-file (string-append (assoc-ref outputs "out")
-                                         "/lib/libusbguard.a"))
-             #t))
+                                         "/lib/libusbguard.a"))))
          (add-after 'install 'install-zsh-completion
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -869,8 +867,7 @@ applications.")
                      (string-append out "/share/zsh/site-functions")))
                (mkdir-p site-functions)
                (copy-file "scripts/usbguard-zsh-completion"
-                          (string-append site-functions "/_usbguard"))
-               #t))))
+                          (string-append site-functions "/_usbguard"))))))
        #:make-flags
        (list (string-append "BASH_COMPLETION_DIR="
                             (assoc-ref %outputs "out")
@@ -883,28 +880,28 @@ applications.")
         "--with-dbus"
         "--with-polkit")))
     (inputs
-     `(("audit" ,audit)
-       ("catch" ,catch-framework)
-       ("dbus-glib" ,dbus-glib)
-       ("ldap" ,openldap)
-       ("libcap-ng" ,libcap-ng)
-       ("libseccomp" ,libseccomp)
-       ("libsodium" ,libsodium)
-       ("pegtl" ,pegtl)
-       ("polkit" ,polkit)
-       ("protobuf" ,protobuf)
-       ("libqb" ,libqb)))
+     (list audit
+           catch-framework
+           dbus-glib
+           openldap
+           libcap-ng
+           libseccomp
+           libsodium
+           pegtl
+           polkit
+           protobuf
+           libqb))
     (native-inputs
-     `(("asciidoc" ,asciidoc)
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("bash-completion" ,bash-completion)
-       ("gdbus-codegen" ,glib "bin")
-       ("umockdev" ,umockdev)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)
-       ("pkg-config" ,pkg-config)))
+     (list asciidoc
+           autoconf
+           automake
+           libtool
+           bash-completion
+           `(,glib "bin")
+           umockdev
+           libxml2
+           libxslt
+           pkg-config))
     (home-page "https://usbguard.github.io")
     (synopsis "Helps to protect your computer against rogue USB devices (a.k.a. BadUSB)")
     (description "USBGuard is a software framework for implementing USB device