From patchwork Wed Feb 13 19:22:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1082 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 30D3116C17; Wed, 13 Feb 2019 19:31:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C5D5616C15 for ; Wed, 13 Feb 2019 19:30:59 +0000 (GMT) Received: from localhost ([127.0.0.1]:34027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0FH-0002sk-8x for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EM-00020B-Lt for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08a-00057z-Oy for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48065) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08Z-00051L-I0 for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu08Z-0001lY-Cz for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 5/8] gnu: gdm: Simplify pre-configure phase. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34470@debbugs.gnu.org Received: via spool by 34470-submit@debbugs.gnu.org id=B34470.15500857916677 (code B ref 34470); Wed, 13 Feb 2019 19:24:03 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:11 +0000 Received: from localhost ([127.0.0.1]:47332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07j-0001jd-5c for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:11 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07h-0001j3-9m for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:09 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3D630243CF; Wed, 13 Feb 2019 14:23:04 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=kboH7UXzMCoW4+HWEkK6beZL59mZ5Ese6C7Q/6U6MzM=; b=CARsXXU8 lNKk00z3ruzGo++0bqaFRn7RAdme7CvHdUZlaENotCZtntP/IzKXgBKH7c+8VooA 6xvxxoLcMbAIhQ5lwp3dB+Ra9Puj+lxXATHcNHdzDeWRYif4L2h1bsGLBpdjRCDi k0lmdE4hj9/iOuUtIiL/V5zm+j/AnR8CfysD2OKu/sRkgdenZZEdy3N/9oFppSJ2 HVTDQBF/MUnfjOpX9MvkOKmRm1MZ7GMkf2EGXWsnvMheez1NpZh9Q2Bcf9a4Fla8 0ZkVlEWTOnsXz70cWYIg1WEhOj6/tIX0g3yk8ByCCN15til2UekXoGn486F0h8Cd 1CnlHzKNW+jLjw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomh epvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihrohdrtghomheq necuffhomhgrihhnpehlihgsgihmlhdvrdhruhhnnecukfhppeejgedrudduiedrudekie drgeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgt ohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from mrblack.lan (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id B4613E409D; Wed, 13 Feb 2019 14:23:03 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:18 -0500 Message-Id: <20190213192221.26599-5-samplet@ngyro.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <87o97fijyh.fsf@ngyro.com> References: <87o97fijyh.fsf@ngyro.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (gdm)[arguments]: Simplify the pre-configure phase. --- gnu/packages/gnome.scm | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fdc5b68ef6..da1c976e07 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5378,25 +5378,21 @@ libxml2.") "\"/run/current-system/profile/share/wayland") (("DATADIR \"/gnome") "\"/run/current-system/profile/share/gnome")) - (substitute* '("daemon/gdm-session.c") - (("set_up_session_environment \\(self\\);") - (string-append - "set_up_session_environment (self);\n" - ;; Propagate GDM_X_SERVER environment variable (which is set - ;; by the GDM service, as it's a function of what X modules - ;; the user decides to have available) down to worker - ;; processes. - "gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n" - " g_getenv (\"GDM_X_SERVER\"));\n" - ;; Propagate the GDM_CUSTOM_CONF environment variable. - "gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" - " g_getenv (\"GDM_CUSTOM_CONF\"));\n" - ;; The session bus (which GDM will initialize from the this - ;; session environment) needs to know where to find the system - ;; service files. - "gdm_session_set_environment_variable (self, \"XDG_DATA_DIRS\",\n" - " \"/run/current-system/profile/share\");\n" - ))) + (let ((propagate '("GDM_CUSTOM_CONF" + "GDM_X_SERVER" + ;; XXX: Remove this once GNOME Shell is + ;; a dependency of GDM. + "XDG_DATA_DIRS"))) + (substitute* "daemon/gdm-session.c" + (("set_up_session_environment \\(self\\);") + (apply string-append + "set_up_session_environment (self);\n" + (map (lambda (name) + (string-append + "gdm_session_set_environment_variable " + "(self, \"" name "\"," + "g_getenv (\"" name "\"));\n")) + propagate))))) ;; Look for custom GDM conf in /run/current-system. (substitute* '("common/gdm-settings-desktop-backend.c") (("GDM_CUSTOM_CONF")