diff options
Diffstat (limited to 'gnu/packages/hardware.scm')
| -rw-r--r-- | gnu/packages/hardware.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ce3f396d0a..7ca565e17f 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages check) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) @@ -399,13 +400,16 @@ applications.") (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) @@ -429,7 +433,6 @@ applications.") #:configure-flags (list "--localstatedir=/var" - "--with-bundled-pegtl" "--enable-systemd=no" "--with-ldap" "--with-dbus" @@ -442,13 +445,12 @@ applications.") ("libcap-ng" ,libcap-ng) ("libseccomp" ,libseccomp) ("libsodium" ,libsodium) + ("pegtl" ,pegtl) ("polkit" ,polkit) ("protobuf" ,protobuf) ("libqb" ,libqb))) (native-inputs `(("asciidoc" ,asciidoc) - ("autoconf" ,autoconf) - ("automake" ,automake) ("bash-completion" ,bash-completion) ("gdbus-codegen" ,glib "bin") ("umockdev" ,umockdev) |