[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: qt5ct: Fix build.
From: |
guix-commits |
Subject: |
branch master updated: gnu: qt5ct: Fix build. |
Date: |
Tue, 02 Aug 2022 23:13:32 -0400 |
This is an automated email from the git hooks/post-receive script.
iyzsong pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 3d727b8334 gnu: qt5ct: Fix build.
3d727b8334 is described below
commit 3d727b8334e88d641a8dc16314a7dd0cb5ccf66e
Author: Morgan Smith <Morgan.J.Smith@outlook.com>
AuthorDate: Tue Aug 2 22:00:02 2022 -0400
gnu: qt5ct: Fix build.
* gnu/packages/qt.scm (qt5ct)[build-system]: Change to qt-build-system.
[arguments]: Adjust accordingly.
[inputs]: Remove qtbase-5.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
gnu/packages/qt.scm | 39 ++++++++++++---------------------------
1 file changed, 12 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f74f84f2ac..86f5d11714 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -159,37 +159,22 @@
(string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
(sha256
(base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn"))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(arguments
- `(#:tests? #f ; No target
- #:imported-modules
- (,@%qt-build-system-modules)
- #:modules
- ((guix build gnu-build-system)
- ((guix build qt-build-system)
- #:prefix qt:)
- (guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "qt5ct.pro"
- (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
- (search-input-file inputs "/bin/lrelease")))))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (invoke "qmake"
- (string-append "PREFIX=" out)
- (string-append "BINDIR=" out "/bin")
- (string-append "DATADIR=" out "/share")
- (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))))
- (add-after 'install 'qt-wrap
- (assoc-ref qt:%standard-phases 'qt-wrap)))))
+ (list
+ #:tests? #f ; No target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt"
+ "src/qt5ct-style/CMakeLists.txt")
+ (("\\$\\{PLUGINDIR\\}")
+ (string-append #$output "/lib/qt5/plugins"))))))))
(native-inputs
(list qttools-5))
(inputs
- (list qtbase-5 qtsvg-5))
+ (list qtsvg-5))
(synopsis "Qt5 Configuration Tool")
(description "Qt5CT is a program that allows users to configure Qt5
settings (such as icons, themes, and fonts) in desktop environments or
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: qt5ct: Fix build.,
guix-commits <=