guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/18: home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.


From: guix-commits
Subject: 03/18: home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
Date: Fri, 5 Aug 2022 09:28:54 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit b57c656f72cee42ebbd78fe2267689aecfbd970e
Author: Andrew Tropin <andrew@trop.in>
AuthorDate: Tue Aug 2 08:00:21 2022 +0300

    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.
    
    Signed-off-by: Ludovic Court├Ęs <ludo@gnu.org>
---
 gnu/home/services/xdg.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 04cf9d0aed..63c6041cd4 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -110,12 +110,18 @@ services more consistent."))
            ((@ (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)))
-                 home-xdg-base-directories-configuration-fields)))
+         '#$(filter-map
+             (lambda (field)
+               (let ((variable
+                      (string-append
+                       "XDG_"
+                       (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" variable))
+                      variable)))
+             home-xdg-base-directories-configuration-fields)))
 
 (define (last-extension-or-cfg config extensions)
   "Picks configuration value from last provided extension.  If there



reply via email to

[Prev in Thread] Current Thread [Next in Thread]