From ae36d514aa011dd9635c9a3817dcb6b0e000be27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 28 Apr 2024 23:37:24 +0200 Subject: =?UTF-8?q?services:=20lightdm:=20Use=20=E2=80=98make-forkexec-con?= =?UTF-8?q?structor=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/lightdm.scm (lightdm-shepherd-service)[start]: Use ‘make-forkexec-constructor’ directly. Change-Id: Iaaa8dcde123ea80ce63c09033b681e40ccc589a4 --- gnu/services/lightdm.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/lightdm.scm b/gnu/services/lightdm.scm index b966f402d6..18beaa44de 100644 --- a/gnu/services/lightdm.scm +++ b/gnu/services/lightdm.scm @@ -620,24 +620,23 @@ port=" (number->string vnc-server-port) "\n" (provision '(lightdm display-manager xorg-server)) (respawn? #f) (start - #~(lambda () - ;; Note: sadly, environment variables defined for 'lightdm' are - ;; cleared and/or overridden by /etc/profile by its spawned greeters, - ;; so an out-of-band means such as /etc is required. - (fork+exec-command #$lightdm-command - ;; Lightdm needs itself in its PATH. - #:environment-variables - (list - ;; It knows to look for greeter configurations in - ;; XDG_CONFIG_DIRS... - (string-append "XDG_CONFIG_DIRS=" - #$greeters-config-dir) - ;; ... and for greeter .desktop files as well as - ;; lightdm accountsservice interface in - ;; XDG_DATA_DIRS. - (string-append "XDG_DATA_DIRS=" - #$data-dirs) - (string-append "PATH=" #$lightdm-paths))))) + ;; Note: sadly, environment variables defined for 'lightdm' are + ;; cleared and/or overridden by /etc/profile by its spawned greeters, + ;; so an out-of-band means such as /etc is required. + #~(make-forkexec-constructor #$lightdm-command + ;; Lightdm needs itself in its PATH. + #:environment-variables + (list + ;; It knows to look for greeter + ;; configurations in XDG_CONFIG_DIRS... + (string-append "XDG_CONFIG_DIRS=" + #$greeters-config-dir) + ;; ... and for greeter .desktop files as + ;; well as lightdm accountsservice + ;; interface in XDG_DATA_DIRS. + (string-append "XDG_DATA_DIRS=" + #$data-dirs) + (string-append "PATH=" #$lightdm-paths)))) (stop #~(make-kill-destructor))))) (define lightdm-service-type -- cgit v1.2.3