From 43c5723fb4711a2f7f094fc7e86163fc56c65a98 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 23 Jan 2026 15:05:23 +0100 Subject: [PATCH] gnu: libaccounts-qt6: Disinherit from libaccounts-qt. * gnu/packages/qt.scm (libaccounts-qt6): Copy fields from libaccounts-qt instead of inheriting. Change-Id: Ia22b9ec8c231233ddfb0554e6c664005d0f773de --- gnu/packages/qt.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 40b8bc5fa2f..ae79a0eee94 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -6212,14 +6212,44 @@ credentials and service-specific settings.") (define-public libaccounts-qt6 (package - (inherit libaccounts-qt) (name "libaccounts-qt6") - (native-inputs (modify-inputs (package-native-inputs libaccounts-qt) - (replace "qtbase" qtbase) - (replace "qttools" qttools))) - (inputs (modify-inputs (package-inputs libaccounts-qt) - (replace "signond" signond-qt6))) - (synopsis "Qt6 bindings for libaccounts-glib"))) + (version "1.17") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/accounts-sso/libaccounts-qt") + (commit (string-append "VERSION_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0859nsksgfrj6ynj74awj1fr6slwcjavs989xc7mbgpvi87n1xlq")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;TODO + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "tests/tst_libaccounts.pro" + (("QMAKE_RPATHDIR = \\$\\$\\{QMAKE_LIBDIR\\}") + (string-append "QMAKE_RPATHDIR =" + #$output "/lib"))) + (invoke "qmake" + (string-append "PREFIX=" #$output) + (string-append "LIBDIR=" #$output "/lib"))))))) + ;; * SignOnQt5 (required version >= 8.55), D-Bus service which performs + ;; user authentication on behalf of its clients, + ;; + (native-inputs (list doxygen pkg-config qtbase qttools)) + (inputs (list glib signond-qt6 libaccounts-glib)) + (home-page "https://accounts-sso.gitlab.io/") + (synopsis "Qt6 bindings for libaccounts-glib") + (description + "Accounts SSO is a framework for application developers who +wish to acquire, use and store web account details and credentials. It +handles the authentication process of an account and securely stores the +credentials and service-specific settings.") + (license license:lgpl2.1+))) (define-public libsignon-glib (package