gnu: usbguard: Fix warning about 'catch'.

* gnu/packages/hardware.scm (usbguard)[arguments]: Rename phase
'patch-makefile' to 'patch-build-scripts', patch 'Makefile.in' files
instead of 'Makefile.am' and fix 'catch' include path.
[native-inputs]: Remove 'autoconf' and 'automake'.
This commit is contained in:
Brice Waegeneire 2020-05-07 11:16:51 +02:00
parent febd19daaa
commit f96ddb6096
No known key found for this signature in database
GPG key ID: A94903A166A18FAE

View file

@ -400,13 +400,16 @@ (define-public usbguard
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-makefile
(lambda _
(add-after 'unpack 'patch-build-scripts
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "configure"
(("/usr/include/catch")
(string-append (assoc-ref inputs "catch") "/include")))
;; Do not create log directory.
(substitute* "Makefile" ((".*/log/usbguard.*") ""))
(substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
;; Disable LDAP tests: they use 'sudo'.
(substitute* "src/Tests/Makefile.am"
(("WITH_LDAP") "FALSE"))
(substitute* "src/Tests/Makefile.in"
(("\\$\\(am__append_2\\)") ""))
#t))
(add-after 'install 'delete-static-library
(lambda* (#:key outputs #:allow-other-keys)
@ -448,8 +451,6 @@ (define-public usbguard
("libqb" ,libqb)))
(native-inputs
`(("asciidoc" ,asciidoc)
("autoconf" ,autoconf)
("automake" ,automake)
("bash-completion" ,bash-completion)
("gdbus-codegen" ,glib "bin")
("umockdev" ,umockdev)