me
/
guix
Archived
1
0
Fork 0
Code

services: sddm: Adjust pass env. 

* gnu/services/sddm.scm (sddm-shepherd-service): Adjust pass env when sddm
build with qt6.

Change-Id: Iabaa22824db8048c7c86921010b970226f85b7a5
master
Zheng Junjie 2024-05-07 10:14:32 +08:00
parent 86ebaa278a
commit 8b5c21269f
No known key found for this signature in database
GPG Key ID: 3B5AA993E1A2DFF0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/services/sddm.scm
View File

@ -33,6 +33,8 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (guix utils)
#:use-module (guix packages)
#:export (sddm-configuration #:export (sddm-configuration
sddm-configuration? sddm-configuration?
sddm-service-type sddm-service-type
@ -165,8 +167,13 @@ Relogin=" (if (sddm-configuration-relogin? config)
(define (sddm-shepherd-service config) (define (sddm-shepherd-service config)
"Return a <shepherd-service> for sddm with 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 (define sddm-command
#~(list (string-append #$(sddm-configuration-sddm config) "/bin/sddm"))) #~(list (string-append #$sddm "/bin/sddm")))
(list (shepherd-service (list (shepherd-service
(documentation "SDDM display manager.") (documentation "SDDM display manager.")
@ -179,8 +186,12 @@ Relogin=" (if (sddm-configuration-relogin? config)
(cons* (cons*
"XDG_DATA_DIRS=/run/current-system/profile/share" "XDG_DATA_DIRS=/run/current-system/profile/share"
"XDG_CONFIG_DIRS=/run/current-system/profile/etc/xdg" "XDG_CONFIG_DIRS=/run/current-system/profile/etc/xdg"
"QT_PLUGIN_PATH=/run/current-system/profile/lib/qt5/plugins" #$(string-append "QT_PLUGIN_PATH=/run/current-system/profile/lib/qt"
"QML2_IMPORT_PATH=/run/current-system/profile/lib/qt5/qml" (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)))) (default-environment-variables))))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))