~ruther/guix-local

ad5140e5c2653210395b23ad8d49cc31d925e92c — 宋文武 1 year, 6 months ago 4838b7b
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.cournoyer@gmail.com>
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2 files changed, 3 insertions(+), 3 deletions(-)

M gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
M gnu/services/xorg.scm
M gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch => gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch +2 -2
@@ 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;

M gnu/services/xorg.scm => gnu/services/xorg.scm +1 -1
@@ 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="