[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
158/347: services: sddm: Adjust pass env.
From: |
guix-commits |
Subject: |
158/347: services: sddm: Adjust pass env. |
Date: |
Fri, 28 Jun 2024 09:58:50 -0400 (EDT) |
z572 pushed a commit to branch kde-team
in repository guix.
commit 9f17519c0a7cbc82272026e809517dd271f420c3
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Tue May 7 10:14:32 2024 +0800
services: sddm: Adjust pass env.
* gnu/services/sddm.scm (sddm-shepherd-service): Adjust pass env when sddm
build with qt6.
Change-Id: Iabaa22824db8048c7c86921010b970226f85b7a5
---
gnu/services/sddm.scm | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm
index 48695e2806..92d64cc599 100644
--- a/gnu/services/sddm.scm
+++ b/gnu/services/sddm.scm
@@ -33,6 +33,8 @@
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (guix deprecation)
+ #:use-module (guix utils)
+ #:use-module (guix packages)
#:export (sddm-configuration
sddm-configuration?
sddm-service-type
@@ -165,8 +167,13 @@ Relogin=" (if (sddm-configuration-relogin?
config)
(define (sddm-shepherd-service config)
"Return a <shepherd-service> for sddm with CONFIG."
+ (define sddm (sddm-configuration-sddm config))
+ (define qt6? (version-prefix?
+ "6"
+ (package-version (lookup-package-input sddm "qtbase"))))
+
(define sddm-command
- #~(list (string-append #$(sddm-configuration-sddm config) "/bin/sddm")))
+ #~(list (string-append #$sddm "/bin/sddm")))
(list (shepherd-service
(documentation "SDDM display manager.")
@@ -179,8 +186,12 @@ Relogin=" (if (sddm-configuration-relogin?
config)
(cons*
"XDG_DATA_DIRS=/run/current-system/profile/share"
"XDG_CONFIG_DIRS=/run/current-system/profile/etc/xdg"
-
"QT_PLUGIN_PATH=/run/current-system/profile/lib/qt5/plugins"
- "QML2_IMPORT_PATH=/run/current-system/profile/lib/qt5/qml"
+ #$(string-append
"QT_PLUGIN_PATH=/run/current-system/profile/lib/qt"
+ (if qt6? "6" "5")
+ "/plugins")
+ #$(string-append "QML" (if qt6? "" "2")
+
"_IMPORT_PATH=/run/current-system/profile/lib/qt"
+ (if qt6? "6" "5") "/qml")
(default-environment-variables))))
(stop #~(make-kill-destructor)))))
- 130/347: gnu: kuserfeedback: Update to 1.3.0., (continued)
- 130/347: gnu: kuserfeedback: Update to 1.3.0., guix-commits, 2024/06/28
- 125/347: gnu: kdegraphics-mobipocket: Update to 24.02.2., guix-commits, 2024/06/28
- 126/347: gnu: Add kfilemetadata-6., guix-commits, 2024/06/28
- 133/347: gnu: kdsoap: Update style., guix-commits, 2024/06/28
- 147/347: gnu: plasma-systemmonitor: Update to 6.0.4., guix-commits, 2024/06/28
- 141/347: gnu: plasma-welcome: Update to 6.0.4., guix-commits, 2024/06/28
- 137/347: gnu: plasma-workspace: Update to 6.0.4., guix-commits, 2024/06/28
- 135/347: gnu: Add kdsoap-ws-discovery-client., guix-commits, 2024/06/28
- 139/347: gnu: kaccounts-integration: Update to 24.02.2., guix-commits, 2024/06/28
- 157/347: gnu: Add sddm-qt5., guix-commits, 2024/06/28
- 158/347: services: sddm: Adjust pass env.,
guix-commits <=
- 149/347: gnu: kinfocenter: Update to 6.0.4., guix-commits, 2024/06/28
- 161/347: gnu: libkomparediff2: Update to 24.02.2., guix-commits, 2024/06/28
- 153/347: gnu: kde-cli-tools: Update to 6.0.4., guix-commits, 2024/06/28
- 163/347: gnu: ktimer: Update to 24.02.2., guix-commits, 2024/06/28
- 164/347: gnu: dolphin: Update to 24.02.2., guix-commits, 2024/06/28
- 166/347: gnu: Add ocean-sound-theme., guix-commits, 2024/06/28
- 165/347: gnu: spectacle: Update to 24.02.2., guix-commits, 2024/06/28
- 170/347: gnu: filelight: Update to 24.02.2., guix-commits, 2024/06/28
- 172/347: gnu: sweeper: Update to 24.02.2., guix-commits, 2024/06/28
- 173/347: gnu: kaccounts-providers: Update to 24.02.2., guix-commits, 2024/06/28