me
/
guix
Archived
1
0
Fork 0
Code

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>
Sughosha 2023-08-16 14:33:14 +02:00 committed by 宋文武
parent 731413a680
commit 16aac5c4bc
No known key found for this signature in database
GPG Key ID: D415BF253B515976
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/kde-plasma.scm
View File

@ -50,6 +50,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages ibus) #:use-module (gnu packages ibus)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes) #:use-module (gnu packages iso-codes)
#:use-module (gnu packages kde) #:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-frameworks)
@ -69,6 +70,7 @@
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages package-management) ; flatpak #:use-module (gnu packages package-management) ; flatpak
#:use-module (gnu packages unicode)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages vpn) #:use-module (gnu packages vpn)
#:use-module (gnu packages vulkan) #:use-module (gnu packages vulkan)
@ -2345,6 +2347,7 @@ sensors, process information and other system resources.")
breeze-icons breeze-icons
dbus dbus
fontconfig fontconfig
icu4c
iso-codes iso-codes
kactivities kactivities
kactivities-stats kactivities-stats
@ -2374,6 +2377,8 @@ sensors, process information and other system resources.")
kquickcharts kquickcharts
kpackage kpackage
kpeople kpeople
kpipewire
kquickcharts
krunner krunner
kscreenlocker kscreenlocker
ktexteditor ktexteditor
@ -2404,6 +2409,7 @@ sensors, process information and other system resources.")
qtbase-5 qtbase-5
qtdeclarative-5 qtdeclarative-5
qtquickcontrols2-5 qtquickcontrols2-5
qttools-5
qtwayland-5 qtwayland-5
qtgraphicaleffects qtgraphicaleffects
qtx11extras qtx11extras
@ -2416,6 +2422,7 @@ sensors, process information and other system resources.")
xmessage xmessage
xsetroot xsetroot
polkit-qt polkit-qt
ucd
libxcursor libxcursor
libkexiv2 libkexiv2
@ -2442,7 +2449,8 @@ sensors, process information and other system resources.")
(let ((xmessage (search-input-file inputs "/bin/xmessage")) (let ((xmessage (search-input-file inputs "/bin/xmessage"))
(xsetroot (search-input-file inputs "/bin/xsetroot")) (xsetroot (search-input-file inputs "/bin/xsetroot"))
(xrdb (search-input-file inputs "/bin/xrdb")) (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" (substitute* "startkde/startplasma.cpp"
(("xmessage") xmessage) (("xmessage") xmessage)
(("xsetroot") xsetroot)) (("xsetroot") xsetroot))
@ -2458,7 +2466,13 @@ sensors, process information and other system resources.")
"startkde/startplasma-wayland.cpp" "startkde/startplasma-wayland.cpp"
"startkde/startplasma-x11.cpp") "startkde/startplasma-x11.cpp")
(("kdeinit5_shutdown") (("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) (delete 'check)
(add-after 'install 'check-after-install (add-after 'install 'check-after-install
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)