diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-05-07 10:14:32 +0800 |
|---|---|---|
| committer | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-07-18 10:45:19 +0800 |
| commit | 8b5c21269f2191fabf5ecfc4f4d03eb68b04b943 (patch) | |
| tree | 534721e66dbf61c8260619dba4f9c8031b490566 /gnu/services | |
| parent | 86ebaa278abe1caf3f14e8a64c9b84779eb8972f (diff) | |
| download | guix-8b5c21269f2191fabf5ecfc4f4d03eb68b04b943.tar.gz guix-8b5c21269f2191fabf5ecfc4f4d03eb68b04b943.zip | |
services: sddm: Adjust pass env.
* gnu/services/sddm.scm (sddm-shepherd-service): Adjust pass env when sddm
build with qt6.
Change-Id: Iabaa22824db8048c7c86921010b970226f85b7a5
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/sddm.scm | 17 |
1 files 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))))) |