diff options
| author | Bruno Victal <mirai@makinata.eu> | 2023-03-05 15:19:14 +0000 |
|---|---|---|
| committer | Andrew Tropin <andrew@trop.in> | 2023-06-15 13:19:29 +0400 |
| commit | f74df2ab879fc5457982bbc85b7455a90e82317d (patch) | |
| tree | b83ef1ad93f5d1c739c5198517e089d4ff4f9e56 /gnu/home/services/shepherd.scm | |
| parent | 48cdc47d8ce78bd60c71d626627967806906c686 (diff) | |
home: services: xdg-base-directories: Deprecate XDG_LOG_HOME.
XDG_LOG_HOME is non-standard and log files should go to XDG_STATE_HOME
according to the XDG Base Directory Specification.
Fixes <https://issues.guix.gnu.org/61809>.
* gnu/home/services/desktop.scm (home-dbus-shepherd-services): Log to XDG_STATE_HOME.
* gnu/home/services/desktop.scm (home-unclutter-shepherd-services): Log to
XDG_STATE_HOME.
* gnu/home/services/mcron.scm (home-mcron-shepherd-services): Ditto.
* gnu/home/services/pm.scm (home-batsignal-shepherd-services): Ditto.
* gnu/home/services/shepherd.scm (launch-shepherd-gexp): Ditto.
* gnu/home/services/xdg.scm
(home-xdg-base-directories-configuration)[log-home]: Deprecate and unset default value.
(home-xdg-base-directories-environment-variables-service)
(ensure-xdg-base-dirs-on-activation): Handle field deprecation.
(home-xdg-base-directories-service-type): Update description.
Co-authored-by: Andrew Tropin <andrew@trop.in>
Signed-off-by: Andrew Tropin <andrew@trop.in>
Diffstat (limited to 'gnu/home/services/shepherd.scm')
| -rw-r--r-- | gnu/home/services/shepherd.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index ff6d629114..5585ef61b2 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> +;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; ;;; This file is part of GNU Guix. @@ -108,9 +108,10 @@ as shepherd package." (or (getenv "XDG_RUNTIME_DIR") (format #f "/run/user/~a" (getuid))) "/shepherd/socket")) - (let ((log-dir (or (getenv "XDG_LOG_HOME") - (format #f "~a/.local/var/log" - (getenv "HOME"))))) + (let* ((state-dir (or (getenv "XDG_STATE_HOME") + (format #f "~a/.local/state" + (getenv "HOME")))) + (log-dir (string-append state-dir "/log"))) ;; TODO: Remove it, 0.9.2 creates it automatically? ((@ (guix build utils) mkdir-p) log-dir) (system* |