me/guix
Archived
1
0
Fork 0
Code Activity

gnu: keepassxc: Switch to qt-build-system.

Browse source 
* gnu/packages/password-utils.scm (keepassxc): Use qt-build-system.
[build-system]: Switch to qt-build-system.
[arguments]: Drop superfluous phase and modules.
[inputs]: Drop qtbase-5.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Timotej Lazar 2023-09-23 15:14:36 +02:00 • committed by Efraim Flashner
parent 3963fa1a46
commit 509239b368
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/password-utils.scm
View file

@ -63,6 +63,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -154,14 +155,9 @@ human.")
version "-src.tar.xz")) version "-src.tar.xz"))
(sha256 (sha256
(base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055")))) (base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055"))))
(build-system cmake-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:modules '((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules `(,@%cmake-build-system-modules
(guix build qt-utils))
#:configure-flags #:configure-flags
#~(append #~(append
(list "-DWITH_XC_ALL=YES" (list "-DWITH_XC_ALL=YES"
@ -175,13 +171,10 @@ human.")
(replace 'check (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 ;; "TestCli::testClip() Compared values are not the same".
;; same". That test also requires a phase with (setenv ;; Actual (((clipboard->text()))): ""
;; "QT_QPA_PLATFORM" "offscreen") in order to work. ;; Expected (QString("Password")) : "Password"
(invoke "ctest" "--exclude-regex" "testcli")))) (invoke "ctest" "--exclude-regex" "testcli")))))))
(add-after 'install 'wrap-qt
(lambda* (#:key inputs #:allow-other-keys)
(wrap-qt-program "keepassxc" #:output #$output #:inputs inputs))))))
(native-inputs (native-inputs
(append (append
(list qttools-5) (list qttools-5)
@ -201,7 +194,6 @@ human.")
minizip minizip
pcsc-lite pcsc-lite
qrencode qrencode
qtbase-5
qtsvg-5 qtsvg-5
qtwayland-5 qtwayland-5
qtx11extras qtx11extras