lilyp pushed a commit to branch gnome-team
in repository guix.
commit 5efdaf30862228cae853d5f406e61f5798f36cdb
Author: 宋文武 <iyzs...@member.fsf.org>
AuthorDate: Mon Jan 27 19:04:54 2025 +0800
services: gdm: Set GUIX_GDK_PIXBUF_MODULE_FILES.
* gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
* gnu/services/xorg.scm (gdm-shepherd-service): Replace
GDK_PIXBUF_MODULE_FILE
with GUIX_GDK_PIXBUF_MODULE_FILES.
Reviewed-by: Maxim Cournoyer <maxim.courno...@gmail.com>
Signed-off-by: Liliana Marie Prikler <liliana.prik...@gmail.com>
---
gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch | 4 ++--
gnu/services/xorg.scm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
index 2c095c8003..5108da33df 100644
--- a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
+++ b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
@@ -1,6 +1,6 @@
From: Josselin Poiret <d...@jpoiret.xyz>
Date: Tue, 23 Nov 2021 18:39:39 +0000
-Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions
+Subject: [PATCH] Make GDM pass GUIX_GDK_PIXBUF_MODULE_FILES to sessions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 932c3e8a..a50dcc8c 100644
--- a/daemon/gdm-launch-environment.c
@@ -9,7 +9,7 @@ index 932c3e8a..a50dcc8c 100644
"WINDOWPATH",
"XCURSOR_PATH",
"XDG_CONFIG_DIRS",
-+ "GDK_PIXBUF_MODULE_FILE",
++ "GUIX_GDK_PIXBUF_MODULE_FILES",
NULL
};
char *system_data_dirs;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 1d7e3ae973..bef05b9bb9 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1291,7 +1291,7 @@ argument.")))
;; the corresponding line in /etc/profile.
"XCURSOR_PATH=/run/current-system/profile/share/icons"
(string-append
- "GDK_PIXBUF_MODULE_FILE="
+ "GUIX_GDK_PIXBUF_MODULE_FILES="
#$gnome-shell "/" #$%gdk-pixbuf-loaders-cache-file)
(string-append
"GDM_WAYLAND_SESSION="
