From patchwork Mon Jan 27 04:27:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tusharhero--- via Guix-patches via X-Patchwork-Id: 37768 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D10C27BBEA; Mon, 27 Jan 2025 04:24:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E41FC27BBE2 for ; Mon, 27 Jan 2025 04:24:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tcGfO-00023E-OY; Sun, 26 Jan 2025 23:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcGfL-00022d-3n for guix-patches@gnu.org; Sun, 26 Jan 2025 23:24:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tcGfK-0000F4-RM for guix-patches@gnu.org; Sun, 26 Jan 2025 23:24:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1Sit+uoDzaC9uIiWnoKI5k9aPJ6e0hDfDCl3BsDnd38=; b=XsLWWx5l/l1NqvnMEDm9YO+u7Upm1eTF4iBpvfdK6sm3cUuYXt86MD2y9hT+m9b0JYfIA+LlFJdHN95l3RbVObufiisNZSnFHQuUeomiP3FpFr3La5wTvPWGNt20Ym4uBReysd5moneeqXa97nTTHMteCIQw3iuxXBHcntXdcAFzKXi8ConEZRw5yP0TJ/GtJAftX1m8AtpyW8QxnptTaP0mcUWsVu+GJQimMAAQ1XSuiQGMYHPp3El1rwKQbBF8vIugpt27k5n1IlIND7S+RiThc1y/8f9neF+jZSVblNpmGek/JQErxHNkY7f5HoprKowcHDh387zm0d3p8MCV9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tcGfK-0006H8-LO for guix-patches@gnu.org; Sun, 26 Jan 2025 23:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75795] [gnome-team v2 2/2] services: gdm: Set GUIX_GDK_PIXBUF_MODULE_FILES. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Jan 2025 04:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 75795@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75795-submit@debbugs.gnu.org id=B75795.173795182824092 (code B ref 75795); Mon, 27 Jan 2025 04:24:02 +0000 Received: (at 75795) by debbugs.gnu.org; 27 Jan 2025 04:23:48 +0000 Received: from localhost ([127.0.0.1]:58732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcGf6-0006GW-5r for submit@debbugs.gnu.org; Sun, 26 Jan 2025 23:23:48 -0500 Received: from mail.envs.net ([5.199.136.28]:48838) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcGez-0006GA-UK for 75795@debbugs.gnu.org; Sun, 26 Jan 2025 23:23:42 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 0D22538A3E6A; Mon, 27 Jan 2025 04:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1737951821; bh=1Sit+uoDzaC9uIiWnoKI5k9aPJ6e0hDfDCl3BsDnd38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YvUHiQxUf9AFZvUrrdbBlq+exKQPv+26pceZpfGuNdppDMljB2yqIfCrrmMhTP9pm onmCwUCllutfdIgehsuBQgbUXZnE69yvFgZwY2U/IKd56H0BEEW8cN8D2ycX5kv6U8 nmJ0CRmZ/8PW7O0paSCgox+4xywBRjS774yUblKyyLxkHsRc9UFBmMXg4yazKloBBC hUh81cz5FCsV4SN/gGNlBuanSVdUsBMS2cp6jhtb53lMh4jj2kRDwq0Vedp/v7PYyc w9v81anACTKVwcS4ZzJOUcmkGmBgvSftC7hUKF8JNliAyRWVkW/bGQExNBt8milZqD 4s17lxdLndwKHyZn3oO5WonkaTnW4i9QHp0ufpAyaxvJ6eFUCNhLPczG2kBkfOn80m I8UKWnkTpynx5hkP0dmqWxqeiEwJ5LnscMHHuEFuKR8OTB3LbAmi4gngPb3IFxci1X 41dDO5JVWSy9jpzZg6jW6E903Jd16Uy3JofuVh+VaTLcuRy2oNOwHWF8C+JvYIGOBH zosvBFE/ZIg3uqWgcEDSQVVqm4ADQ7x+9oPGBbTNbU58hUasRfQ6N+l0K2n+5uKDyY QfD/oeFCILmZImrN0nCELWw+oFxmurie/oT1ZFoT1KjDgjhfYKWShV2Rkhl1O3V14Z +wNFEtSpITd+YqDzZT3sywZo= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id vWxu9W5Mu8vs; Mon, 27 Jan 2025 04:23:38 +0000 (UTC) Received: from localhost (unknown [112.44.100.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Mon, 27 Jan 2025 04:23:37 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 77c75b0f; Mon, 27 Jan 2025 04:27:12 +0000 (UTC) Date: Mon, 27 Jan 2025 12:27:03 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <112469ef967a464b64dd552a70b8af6e19d8766c.1737951075.git.iyzsong@member.fsf.org> References: <112469ef967a464b64dd552a70b8af6e19d8766c.1737951075.git.iyzsong@member.fsf.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: tusharhero--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * 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 --- 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 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="