From 20c4af554cc3822168bd17de2b1a4cb26f8c6852 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 13 Jul 2023 14:47:58 -0500 Subject: [PATCH] a working build of qt5ct-kde This patch comes from the AUR to add the ability for kde apps to work better under qt5ct. Especially with apps using QML. --- guix/pkgs/qt5ct-kde.scm | 21 --------------------- guix/pkgs/qt5ct.scm | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 guix/pkgs/qt5ct-kde.scm diff --git a/guix/pkgs/qt5ct-kde.scm b/guix/pkgs/qt5ct-kde.scm deleted file mode 100644 index bd64ad2..0000000 --- a/guix/pkgs/qt5ct-kde.scm +++ /dev/null @@ -1,21 +0,0 @@ -(define-module (pkgs qt5ct-kde) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system qt) - #:use-module (gnu packages) - #:use-module (gnu packages qt) - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module (srfi srfi-1)) - -(define-public qt5ct-kde - (package - (inherit qt5ct) - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) - (patches (search-patches "qt5ct-kde.patch")) - (sha256 - (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))))) diff --git a/guix/pkgs/qt5ct.scm b/guix/pkgs/qt5ct.scm index 147306f..4a7fd64 100644 --- a/guix/pkgs/qt5ct.scm +++ b/guix/pkgs/qt5ct.scm @@ -1,24 +1,34 @@ (define-module (pkgs qt5ct) + #:use-module (guile) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages qt) - #:use-module (guix gexp)) + #:use-module (gnu packages kde-frameworks) + #:use-module (guix gexp) + #:use-module (srfi srfi-1)) (define-public qt5ct-kde (package (inherit qt5ct) + (version "1.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) - (patches (search-patches "qt5ct-kde.patch")) + (patches '("./patches/qt5ct-kde.patch")) (sha256 - (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))) - )) + (base32 "1mxqallxw0b5p4kjfnvv9ndzws54si4a3xlz3gnxyl2cdrm58n7d")))) + (inputs (modify-inputs + (package-inputs qt5ct) + (append qtquickcontrols2-5 + qtdeclarative-5 + plasma-framework + kconfigwidgets + kiconthemes))))) qt5ct-kde