From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 21 Jul 2022 17:06:24 +0300 Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script. * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir XDG_RUNTIME_DIR in activation script. --- gnu/home/services/xdg.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm index 5a41dc4994..541f64a379 100644 --- a/gnu/home/services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config) (with-imported-modules '((guix build utils)) #~(map (lambda (xdg-base-dir-variable) ((@ (guix build utils) mkdir-p) - (getenv - xdg-base-dir-variable))) - '#$(map (lambda (field) - (format - #f "XDG_~a" - (object->snake-case-string - (configuration-field-name field) 'upper))) + (getenv xdg-base-dir-variable))) + '#$(filter-map + (lambda (field) + (let ((env-var-name + (format + #f "XDG_~a" + (object->snake-case-string + (configuration-field-name field) 'upper)))) + ;; XDG_RUNTIME_DIR shouldn't be created during activation + ;; and will be provided by elogind or other service. + (and (not (string=? "XDG_RUNTIME_DIR" env-var-name)) + env-var-name))) home-xdg-base-directories-configuration-fields)))) (define (last-extension-or-cfg config extensions) -- 2.37.0