[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: plasma-workspace: Add more inputs and patch path for qdbus.
From: |
guix-commits |
Subject: |
02/07: gnu: plasma-workspace: Add more inputs and patch path for qdbus. |
Date: |
Thu, 17 Aug 2023 06:54:34 -0400 (EDT) |
iyzsong pushed a commit to branch kde-updates
in repository guix.
commit 16aac5c4bc18e415f8078c623d995b0ce3866ad6
Author: Sughosha <sughosha@disroot.org>
AuthorDate: Wed Aug 16 14:33:14 2023 +0200
gnu: plasma-workspace: Add more inputs and patch path for qdbus.
* gnu/packages/kde-plasma.scm (plasma-workspace)[inputs]: Add icu4c,
kpipewire,
kquickcharts, and qttools-5.
[arguments]<#:phases>: Patch QtBinariesDir for qdbus.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
gnu/packages/kde-plasma.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index b23c2c6ce8..25b1370947 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -50,6 +50,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages ibus)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
@@ -69,6 +70,7 @@
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages package-management) ; flatpak
+ #:use-module (gnu packages unicode)
#:use-module (gnu packages video)
#:use-module (gnu packages vpn)
#:use-module (gnu packages vulkan)
@@ -2345,6 +2347,7 @@ sensors, process information and other system resources.")
breeze-icons
dbus
fontconfig
+ icu4c
iso-codes
kactivities
kactivities-stats
@@ -2374,6 +2377,8 @@ sensors, process information and other system resources.")
kquickcharts
kpackage
kpeople
+ kpipewire
+ kquickcharts
krunner
kscreenlocker
ktexteditor
@@ -2404,6 +2409,7 @@ sensors, process information and other system resources.")
qtbase-5
qtdeclarative-5
qtquickcontrols2-5
+ qttools-5
qtwayland-5
qtgraphicaleffects
qtx11extras
@@ -2416,6 +2422,7 @@ sensors, process information and other system resources.")
xmessage
xsetroot
polkit-qt
+ ucd
libxcursor
libkexiv2
@@ -2442,7 +2449,8 @@ sensors, process information and other system resources.")
(let ((xmessage (search-input-file inputs "/bin/xmessage"))
(xsetroot (search-input-file inputs "/bin/xsetroot"))
(xrdb (search-input-file inputs "/bin/xrdb"))
- (kinit #$(this-package-input "kinit")))
+ (kinit #$(this-package-input "kinit"))
+ (qttools #$(this-package-input "qttools")))
(substitute* "startkde/startplasma.cpp"
(("xmessage") xmessage)
(("xsetroot") xsetroot))
@@ -2458,7 +2466,13 @@ sensors, process information and other system
resources.")
"startkde/startplasma-wayland.cpp"
"startkde/startplasma-x11.cpp")
(("kdeinit5_shutdown")
- (string-append kinit "/bin/kdeinit5_shutdown"))))))
+ (string-append kinit "/bin/kdeinit5_shutdown")))
+ ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in
+ ;; qttools.
+ (substitute* "CMakeLists.txt"
+ (("ecm_query_qt\\(QtBinariesDir QT_INSTALL_BINS\\)")
+ (string-append "set(QtBinariesDir \"" qttools
+ "/bin\")"))))))
(delete 'check)
(add-after 'install 'check-after-install
(lambda* (#:key tests? #:allow-other-keys)
- branch kde-updates updated (461602d07c -> 9b283090e9), guix-commits, 2023/08/17
- 03/07: gnu: Add kaccounts-providers., guix-commits, 2023/08/17
- 05/07: gnu: plasma: Add kde-gtk-config., guix-commits, 2023/08/17
- 01/07: gnu: extra-cmake-modules: Fix libexec path., guix-commits, 2023/08/17
- 07/07: gnu: sdl2: Remove fcitx from inputs., guix-commits, 2023/08/17
- 02/07: gnu: plasma-workspace: Add more inputs and patch path for qdbus.,
guix-commits <=
- 04/07: gnu: Add kde-gtk-config., guix-commits, 2023/08/17
- 06/07: Merge remote-tracking branch 'origin/master' into kde-updates, guix-commits, 2023/08/17