diff options
Diffstat (limited to 'gnu/packages/hardware.scm')
| -rw-r--r-- | gnu/packages/hardware.scm | 90 |
1 files changed, 44 insertions, 46 deletions
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 68c4667662..d47be7a55d 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1147,9 +1147,7 @@ applications.") (define-public usbguard (package (name "usbguard") - ;; Note: Use a recent snapshot to get compatibility with newer system - ;; libraries. - (version "1.0.0-55-g466f1f0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -1157,51 +1155,51 @@ applications.") (commit (string-append "usbguard-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi")))) + (base32 "0lpyhkz5nr0c9mq57mgcvam5c8qfqqwjc4xd46n2ldqc9vhfsask")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-bootstrap-script - (lambda _ - ;; Don't attempt to fetch git submodules. - (substitute* "autogen.sh" - (("^git submodule.*") - "")))) - (add-after 'bootstrap 'patch-build-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure" - (("/usr/include/catch") - (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\\)") "")))) - (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")))) - (add-after 'install 'install-zsh-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (site-functions - (string-append out "/share/zsh/site-functions"))) - (mkdir-p site-functions) - (copy-file "scripts/usbguard-zsh-completion" - (string-append site-functions "/_usbguard")))))) - #:make-flags - (list (string-append "BASH_COMPLETION_DIR=" - (assoc-ref %outputs "out") - "/etc/bash_completion.d")) - #:configure-flags - (list - "--localstatedir=/var" - "--enable-systemd=no" - "--with-ldap" - "--with-dbus" - "--with-polkit"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-bootstrap-script + (lambda _ + ;; Don't attempt to fetch git submodules. + (substitute* "autogen.sh" + (("^git submodule.*") + "")))) + (add-after 'bootstrap 'patch-build-scripts + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("/usr/include/catch") + (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\\)") "")))) + (add-after 'install 'delete-static-library + (lambda args + ;; It can't be directly disabled since it's needed for the tests. + (delete-file (string-append #$output + "/lib/libusbguard.a")))) + (add-after 'install 'install-zsh-completion + (lambda args + (let ((site-functions + (string-append #$output "/share/zsh/site-functions"))) + (mkdir-p site-functions) + (copy-file "scripts/usbguard-zsh-completion" + (string-append site-functions "/_usbguard")))))) + #:make-flags + #~(list (string-append "BASH_COMPLETION_DIR=" + #$output + "/etc/bash_completion.d")) + #:configure-flags + #~(list + "--localstatedir=/var" + "--enable-systemd=no" + "--with-ldap" + "--with-dbus" + "--with-polkit"))) (inputs (list audit catch-framework |