From b57c656f72cee42ebbd78fe2267689aecfbd970e Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Tue, 2 Aug 2022 08:00:21 +0300
Subject: home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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(-)

(limited to 'gnu/home/services/xdg.scm')

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
-- 
cgit v1.2.3

select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=68679e7c3e13ac07a881a9c8c26985b20bd6fdb4'>root</a>/<a href='/guix/log/tests?id=68679e7c3e13ac07a881a9c8c26985b20bd6fdb4'>tests</a>/<a href='/guix/log/tests/monads.scm?id=68679e7c3e13ac07a881a9c8c26985b20bd6fdb4'>monads.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/monads.scm?id=68679e7c3e13ac07a881a9c8c26985b20bd6fdb4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-04-03 14:19:09 +0200'>2016-04-03</span></td><td><a href='/guix/commit/tests/monads.scm?id=a9edb211e733b8b34e67ec3b4450567e9376986f'>build: Add a Guile custom test driver using SRFI-64.</a><span class='msg-avail'>...</span></td><td>Mathieu Lirzin</td></tr>
<tr><td><span title='2016-03-06 23:16:35 +0100'>2016-03-06</span></td><td><a href='/guix/commit/tests/monads.scm?id=ef8de9852eeb9f9ce8e01a2a4f60a057b890b94a'>tests: Disable grafting by default for most tests.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-09-04 18:31:06 +0200'>2015-09-04</span></td><td><a href='/guix/commit/tests/monads.scm?id=dbbc248aeef1bc3b5d76268782acff43e9d71d57'>monads: Fix 'liftN' fallback case.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-06-08 23:00:49 +0200'>2015-06-08</span></td><td><a href='/guix/commit/tests/monads.scm?id=751630c9c3f7f3e87dfccc5f5ba8cf61cdd6f8fd'>monads: Allow n-ary '&gt;&gt;=' expressions.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-05-27 09:44:43 +0200'>2015-05-27</span></td><td><a href='/guix/commit/tests/monads.scm?id=b734996f9cf395705860703422d5e92565dd3a13'>monads: 'foldm', 'mapm', and 'anym' now take a list of regular values.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-01-17 23:45:48 +0100'>2015-01-17</span></td><td><a href='/guix/commit/tests/monads.scm?id=81a97734e04fa40412b2d44ccfae1b4796257648'>monads: Add the state monad.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-01-14 13:34:52 +0100'>2015-01-14</span></td><td><a href='/guix/commit/tests/monads.scm?id=e87f0591f3117ed61285f33c7cc3548f72e551ad'>monads: Move '%store-monad' and related procedures where they belong.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-01-12 23:33:08 +0100'>2015-01-12</span></td><td><a href='/guix/commit/tests/monads.scm?id=abebac46017f626f25b5c84bdcc1013c3d17632f'>monads: Remove 'derivation-expression'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-01-12 23:33:08 +0100'>2015-01-12</span></td><td><a href='/guix/commit/tests/monads.scm?id=462a3fa36cddeb683df765b2982f76712f6c40f0'>monads: Rewrite 'text-file*' using gexps.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>