* [bug#56901] [PATCH] gnu: qt5ct: Fix build
@ 2022-08-03 2:00 Morgan.J.Smith
2022-08-03 3:14 ` bug#56901: " 宋文武 via Guix-patches via
0 siblings, 1 reply; 2+ messages in thread
From: Morgan.J.Smith @ 2022-08-03 2:00 UTC (permalink / raw)
To: 56901; +Cc: Morgan Smith
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/qt.scm (qt5ct)
[build-system]: Change to qt-build-system
[phases]: Replace
[inputs]: Remove qtbase-5
[modules]: Removed
[impoorted-modules]: Removed
---
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 @@ (define-public qt5ct
(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
--
2.37.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#56901: [PATCH] gnu: qt5ct: Fix build
2022-08-03 2:00 [bug#56901] [PATCH] gnu: qt5ct: Fix build Morgan.J.Smith
@ 2022-08-03 3:14 ` 宋文武 via Guix-patches via
0 siblings, 0 replies; 2+ messages in thread
From: 宋文武 via Guix-patches via @ 2022-08-03 3:14 UTC (permalink / raw)
To: Morgan.J.Smith; +Cc: 56901-done
Morgan.J.Smith@outlook.com writes:
> From: Morgan Smith <Morgan.J.Smith@outlook.com>
>
> * gnu/packages/qt.scm (qt5ct)
> [build-system]: Change to qt-build-system
Applied with some simplify for commit message, thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-03 3:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-03 2:00 [bug#56901] [PATCH] gnu: qt5ct: Fix build Morgan.J.Smith
2022-08-03 3:14 ` bug#56901: " 宋文武 via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).