From patchwork Wed Feb 13 19:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1084 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 D684016C17; Wed, 13 Feb 2019 19:32:43 +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 85B7716C15 for ; Wed, 13 Feb 2019 19:32:43 +0000 (GMT) Received: from localhost ([127.0.0.1]:34043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Gx-0003rc-3W for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:32:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EP-0002Gp-Ov for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08Z-00051a-Ks for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08Y-0004tN-Ik for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu08Y-0001lJ-BF for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 3/8] gnu: gdm: Add links to required login-session files. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:02 +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.15500857846640 (code B ref 34470); Wed, 13 Feb 2019 19:24:02 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:04 +0000 Received: from localhost ([127.0.0.1]:47324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07b-0001iy-KF for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:04 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:58113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07Z-0001hw-Un for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:02 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BA07F2481E; Wed, 13 Feb 2019 14:22:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:22:56 -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=1+aPujHTLN+wbg78DX05Irg9DCUqE08lCnrduj8EQb0=; b=G0OxnYkL 0db/Y/3k1Vex9AhVCNBw1ep2sQz67n8Xl2MprabxcttKrEyhf0o1mdleytV/UOOa QWmKt8kiRiO1Cf7Q1b0ibMF+fgZDNMAC8fCTAVdOcLw4R6d4OcsaJYCSN/oyEfRh HB6OId76cE+TvlTcN/Ze0H1v/YbAWpERQhUsZ2DrYTCRpa2EogCcatKbtueaNdJU TBUHcJgQTAHlme0D8HsyNpxCCyksR7EZ2gyU+mhFQW9/5fONmd1prGyuNd8T6Jgq lGSENiROxxJuzCZ4ShtRWBsXq7HBzz5cM+TfmmV5VnWVfmyft6s9pUdUJ0Perfpm B4ZhdpT5RIZTeA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomh epvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihrohdrtghomheq necukfhppeejgedrudduiedrudekiedrgeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmphhlvghtsehnghihrhhordgtohhmnecuvehluhhsthgvrhfuihiivgeptd 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 449AAE409D; Wed, 13 Feb 2019 14:22:56 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:16 -0500 Message-Id: <20190213192221.26599-3-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]: Add a phase that creates symbolic links to required files from gnome-settings-daemon; do not set XDG_CONFIG_DIRS in the session environment. [inputs]: Add gnome-settings-daemon. --- gnu/packages/gnome.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 59e1011a8f..ac49ca7f2d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5391,16 +5391,6 @@ libxml2.") ;; Propagate the GDM_CUSTOM_CONF environment variable. "gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" " g_getenv (\"GDM_CUSTOM_CONF\"));\n" - ;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a - ;; variable, but it doesn't do that right now. Anyway - ;; /run/current-system/profile/share/gnome-session/sessions/gnome.desktop - ;; requires that a number of .desktop files be present, and - ;; these special .desktop files are in $XDG_CONFIG_DIRS (which - ;; defaults to /etc/xdg if it's not set). Here we need to - ;; provide a value such that the GNOME session's requirements - ;; are met (provided GNOME is installed of course). - "gdm_session_set_environment_variable (self, \"XDG_CONFIG_DIRS\",\n" - " \"/run/current-system/profile/etc/xdg\");\n" ;; The session bus (which GDM will initialize from the this ;; session environment) needs to know where to find the system ;; service files. @@ -5420,7 +5410,25 @@ libxml2.") (substitute* '("daemon/gdm-x-session.c") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) - #t))))) + #t)) + ;; GDM needs GNOME Session to run these applications. We link + ;; their autostart files in `share/gdm/greeter/autostart' + ;; because GDM explicitly tells GNOME Session to look there. + ;; + ;; XXX: GNOME Shell should be linked here too, but currently + ;; GNOME Shell depends on GDM. + (add-after 'install 'link-autostart-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (autostart (string-append out "/share/gdm/" + "greeter/autostart")) + (settings (assoc-ref inputs "gnome-settings-daemon"))) + (mkdir-p autostart) + (with-directory-excursion autostart + (for-each (lambda (desktop) + (symlink desktop (basename desktop))) + (find-files (string-append settings "/etc/xdg")))) + #t)))))) (native-inputs `(("dconf" ,dconf) ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -5433,6 +5441,7 @@ libxml2.") `(("accountsservice" ,accountsservice) ("check" ,check) ; for testing ("elogind" ,elogind) + ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) ("libcanberra" ,libcanberra)