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

gnu: usbguard: Use new package style.

Browse source 
Use G-exps and #$output while we're at it.

* gnu/packages/hardware.scm (usbguard)[arguments]: Use G-expressions.
<#:phases>: Use '#$output' instead of 'assoc-ref'

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
kiasoc5 via Guix-patches via 2022-08-14 09:03:29 -04:00 committed by Tobias Geerinckx-Rice
parent 53b2fda6fe
commit 9b176a05f9
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
gnu/packages/hardware.scm
View file

@ -1160,48 +1160,48 @@ (define-public usbguard
(base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi"))))
(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