gnu: usbguard: Use new package style.
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:
parent
53b2fda6fe
commit
9b176a05f9
|
@ -1160,8 +1160,9 @@ (define-public usbguard
|
|||
(base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-bootstrap-script
|
||||
(lambda _
|
||||
;; Don't attempt to fetch git submodules.
|
||||
|
@ -1179,24 +1180,23 @@ (define-public usbguard
|
|||
(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")
|
||||
(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* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(site-functions
|
||||
(string-append out "/share/zsh/site-functions")))
|
||||
(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="
|
||||
(assoc-ref %outputs "out")
|
||||
#~(list (string-append "BASH_COMPLETION_DIR="
|
||||
#$output
|
||||
"/etc/bash_completion.d"))
|
||||
#:configure-flags
|
||||
(list
|
||||
#~(list
|
||||
"--localstatedir=/var"
|
||||
"--enable-systemd=no"
|
||||
"--with-ldap"
|
||||
|
|
Loading…
Reference in a new issue