TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: usbguard: Fix warning about 'catch'.

Browse source 
* 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
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/hardware.scm
View file

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