[PATCH] system: Remove obsolete GUIX_LOCPATH workaround.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Bruno Victal
Owner
unassigned
Submitted by
Bruno Victal
Severity
normal
B
B
Bruno Victal wrote on 27 Mar 2023 18:56
(address . guix-patches@gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
2ced3f32bcdcffee3983494d35a5a262f98b95ab.1679934713.git.mirai@makinata.eu
* gnu/system.scm (operating-system-environment-variables): Do not set GUIX_LOCPATH.
---

Tested with: make check-system TESTS="basic mcron mpd mympd"

gnu/system.scm | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/system.scm b/gnu/system.scm
index 48cc68f449..c17c6e4e98 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1201,15 +1201,7 @@ (define (operating-system-environment-variables os)
;; By default, applications that use D-Bus, such as Emacs, abort at startup
;; when /etc/machine-id is missing. Make sure these warnings are non-fatal.
- ("DBUS_FATAL_WARNINGS" . "0")
-
- ;; XXX: Normally we wouldn't need to do this, but our glibc@2.23 package
- ;; used to look things up in 'PREFIX/lib/locale' instead of
- ;; '/run/current-system/locale' as was intended. Keep this hack around so
- ;; that people who still have glibc@2.23-using packages in their profiles
- ;; can use them correctly.
- ;; TODO: Remove when glibc@2.23 is long gone.
- ("GUIX_LOCPATH" . "/run/current-system/locale")))
+ ("DBUS_FATAL_WARNINGS" . "0")))
;; Ensure LST is a list of <setuid-program> records and warn otherwise.
(define-with-syntax-properties (ensure-setuid-program-list (lst properties))
--
2.39.1
L
L
Ludovic Courtès wrote on 30 Mar 2023 22:44
(name . Bruno Victal)(address . mirai@makinata.eu)(address . 62489-done@debbugs.gnu.org)
87v8iihsv2.fsf@gnu.org
Hi Bruno,

Bruno Victal <mirai@makinata.eu> skribis:

Toggle quote (2 lines)
> * gnu/system.scm (operating-system-environment-variables): Do not set GUIX_LOCPATH.

Applied, thanks!

Ludo’.
Closed
?