gnu: keepassxc: Improve package style.

* gnu/packages/password-utils.scm (keepassxc)[arguments]: Use G-expressions.
[native-inputs]: Remove labels.
This commit is contained in:
Nicolas Goaziou 2022-03-22 09:50:40 +01:00
parent 0f1f4bf8c5
commit 96777f44ff
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -141,36 +141,36 @@ (define-public keepassxc
(base32 "19va0a9r5px7cbx1ixawaaxrkpfgigb9g81z6h1ngk84164pdgl3")))) (base32 "19va0a9r5px7cbx1ixawaaxrkpfgigb9g81z6h1ngk84164pdgl3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:modules ((guix build cmake-build-system) (list
#:modules '((guix build cmake-build-system)
(guix build qt-utils) (guix build qt-utils)
(guix build utils)) (guix build utils))
#:imported-modules (,@%cmake-build-system-modules #:imported-modules `(,@%cmake-build-system-modules
(guix build qt-utils)) (guix build qt-utils))
#:configure-flags '("-DWITH_XC_ALL=YES" #:configure-flags
"-DWITH_XC_UPDATECHECK=NO") #~(list "-DWITH_XC_ALL=YES"
#:phases "-DWITH_XC_UPDATECHECK=NO")
(modify-phases %standard-phases #:phases
(replace 'check #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
;; Fails with "TestCli::testClip() Compared values are not the ;; Fails with "TestCli::testClip() Compared values are not the
;; same". That test also requires a phase with (setenv ;; same". That test also requires a phase with (setenv
;; "QT_QPA_PLATFORM" "offscreen") in order to work. ;; "QT_QPA_PLATFORM" "offscreen") in order to work.
(invoke "ctest" "--exclude-regex" "testcli")))) (invoke "ctest" "--exclude-regex" "testcli"))))
(add-after 'install 'wrap-qt (add-after 'install 'wrap-qt
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs))))))
(wrap-qt-program "keepassxc" #:output out #:inputs inputs)))))))
(native-inputs (native-inputs
`(("asciidoctor" ,ruby-asciidoctor) (list qttools ruby-asciidoctor))
("qttools" ,qttools)))
(inputs (inputs
(list argon2 (list argon2
botan botan
libgcrypt libgcrypt
libsodium ; XC_BROWSER libsodium ; XC_BROWSER
libusb libusb
libyubikey ; XC_YUBIKEY libyubikey ; XC_YUBIKEY
libxi libxi
libxtst libxtst
minizip minizip
@ -179,9 +179,9 @@ (define-public keepassxc
qtbase-5 qtbase-5
qtsvg qtsvg
qtx11extras qtx11extras
quazip-0 ; XC_KEESHARE quazip-0 ; XC_KEESHARE
readline readline
yubikey-personalization ; XC_YUBIKEY yubikey-personalization ; XC_YUBIKEY
zlib)) zlib))
(home-page "https://www.keepassxc.org") (home-page "https://www.keepassxc.org")
(synopsis "Password manager") (synopsis "Password manager")