diff mbox series

[bug#75795,gnome-team,v3,2/2] services: gdm: Set GUIX_GDK_PIXBUF_MODULE_FILES.

Message ID 2bcfc68b9210a352d874e29925dd810a17c075ae.1737975783.git.iyzsong@member.fsf.org
State New
Headers
Series [bug#75795,gnome-team,v3,1/2] gnu: gdk-pixbuf: Honor GUIX_GDK_PIXBUF_MODULE_FILES search path. |

Commit Message

yelninei--- via Guix-patches via Jan. 27, 2025, 11:04 a.m. UTC 
From: 宋文武 <iyzsong@member.fsf.org>

* 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.
---
 gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch | 4 ++--
 gnu/services/xorg.scm                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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 <dev@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 d3912a7de6..7e179d32b8 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1293,7 +1293,7 @@  (define (gdm-shepherd-service config)
                          ;; 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="