From: Timotej Lazar <timotej.lazar@araneo.si>
To: 66103@debbugs.gnu.org
Cc: mirai@makinata.eu, Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#66103] [PATCH v2] gnu: keepassxc: Switch to qt-build-system.
Date: Sat, 23 Sep 2023 15:14:36 +0200 [thread overview]
Message-ID: <20230923131622.22200-1-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20230919144138.5269-1-timotej.lazar@araneo.si>
* 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.
---
The package was updated on master, so I’m sending just the build-system
change. Workaround for the failing test is still necessary.
gnu/packages/password-utils.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index be85898c41..9e9e48c1f5 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages password-utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix gexp)
@@ -154,14 +155,9 @@ (define-public keepassxc
version "-src.tar.xz"))
(sha256
(base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055"))))
- (build-system cmake-build-system)
+ (build-system qt-build-system)
(arguments
(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
#~(append
(list "-DWITH_XC_ALL=YES"
@@ -178,10 +174,7 @@ (define-public keepassxc
;; Fails with "TestCli::testClip() Compared values are not the
;; same". That test also requires a phase with (setenv
;; "QT_QPA_PLATFORM" "offscreen") in order to work.
- (invoke "ctest" "--exclude-regex" "testcli"))))
- (add-after 'install 'wrap-qt
- (lambda* (#:key inputs #:allow-other-keys)
- (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs))))))
+ (invoke "ctest" "--exclude-regex" "testcli")))))))
(native-inputs
(append
(list qttools-5)
@@ -201,7 +194,6 @@ (define-public keepassxc
minizip
pcsc-lite
qrencode
- qtbase-5
qtsvg-5
qtwayland-5
qtx11extras
--
2.41.0
next prev parent reply other threads:[~2023-09-23 13:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 14:40 [bug#66103] [PATCH] gnu: keepassxc: Update to 2.7.6 Timotej Lazar
2023-09-20 17:26 ` Bruno Victal
2023-09-21 6:41 ` Timotej Lazar
2023-09-23 13:14 ` Timotej Lazar [this message]
2023-09-28 16:36 ` bug#66103: [PATCH v2] gnu: keepassxc: Switch to qt-build-system Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230923131622.22200-1-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=66103@debbugs.gnu.org \
--cc=mirai@makinata.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.