From patchwork Wed Feb 13 19:22:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1080 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 DE35416C17; Wed, 13 Feb 2019 19:30:36 +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, URIBL_BLOCKED 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 5B35F16C15 for ; Wed, 13 Feb 2019 19:30:36 +0000 (GMT) Received: from localhost ([127.0.0.1]:34015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Et-0002c0-SA for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EU-0002IC-4W for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu07e-0001Ct-Mw for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu07a-0000xF-SN for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu07a-0001iU-H7 for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 1/8] services: gdm: Remove etc service. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:23: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.15500857766564 (code B ref 34470); Wed, 13 Feb 2019 19:23:02 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:22:56 +0000 Received: from localhost ([127.0.0.1]:47314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07P-0001he-H1 for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:56 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:44549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07M-0001hQ-Lh for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:50 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4570B21F4F; Wed, 13 Feb 2019 14:22:43 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:22:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :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=KgRBokNmfDbqpnMQGwfpGWOYzbQWuxiyVu+Xn2FId NY=; b=EIDZhscfXJbS5WthMCd5R74meUM51RFDB8AtPO2F2SSaz6JAghc2ZRZnh FpLlJdYbxA+S7WZZumP1XkG9xJtj7a6LHOrxdD9SgnmCrnaEHaMOHCOqVRzZPjMi oWWetW6zUwfsP23A7riGbAQk8hxySLF5HHhIb8IS9OsQVW4rX7bLlxShwZPKAzl4 /2qouX3Tm1CRKDWO1iAbIoeffy1n1+xRfiJwNP4uTljb3v9YdpIuJ1D3EGa4DqVp ie/AZob9PDEyyMD/B1rNxGbvUhjN8heE1Ka7PtxoXCmTT5jWhu8ptv3bzwLqtXiA pp2asSOUrJkZja+subx8v5t5hub2A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhroh hmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvghtsehnghihrhhordgtohhm qeenucfkphepjeegrdduudeirddukeeirdeggeenucfrrghrrghmpehmrghilhhfrhhomh epshgrmhhplhgvthesnhhghihrohdrtghomhenucevlhhushhtvghrufhiiigvpedt 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 66BA2E4543; Wed, 13 Feb 2019 14:22:42 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:14 -0500 Message-Id: <20190213192221.26599-1-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]: Update pre-configure phase to make GDM get the configuration file path from an environment variable. * gnu/services/xorg.scm (gdm-etc-service): Remove function. (gdm-configuration-file): New function. (gdm-shepherd-service): Set GDM_CUSTOM_CONF before invoking GDM. (gdm-service-type)[extensions]: Remove etc-service-type extension. --- gnu/packages/gnome.scm | 9 ++++-- gnu/services/xorg.scm | 67 ++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 367d5de16c..b2c7aa60cc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Björn Höfling -;;; Copyright © 2018 Timothy Sample +;;; Copyright © 2018, 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -5380,6 +5380,9 @@ libxml2.") ;; 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" ;; 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 @@ -5399,7 +5402,9 @@ libxml2.") ;; Look for custom GDM conf in /run/current-system. (substitute* '("common/gdm-settings-desktop-backend.c") (("GDM_CUSTOM_CONF") - "\"/run/current-system/etc/gdm/custom.conf\"")) + (string-append "(g_getenv(\"GDM_CUSTOM_CONF\") != NULL" + " ? g_getenv(\"GDM_CUSTOM_CONF\")" + " : GDM_CUSTOM_CONF)"))) ;; Use service-supplied path to X. (substitute* '("daemon/gdm-server.c") (("\\(X_SERVER X_SERVER_ARG_FORMAT") diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 1efb275794..de5438e3fe 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2018 Timothy Sample +;;; Copyright © 2018, 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -633,38 +633,34 @@ makes the good ol' XlockMore usable." (x-server gdm-configuration-x-server (default (xorg-wrapper)))) -(define (gdm-etc-service config) - (define gdm-configuration-file - (mixed-text-file "gdm-custom.conf" - "[daemon]\n" - "#User=gdm\n" - "#Group=gdm\n" - (if (gdm-configuration-auto-login? config) - (string-append - "AutomaticLoginEnable=true\n" - "AutomaticLogin=" - (or (gdm-configuration-default-user config) - (error "missing default user for auto-login")) - "\n") - (string-append - "AutomaticLoginEnable=false\n" - "#AutomaticLogin=\n")) - "#TimedLoginEnable=false\n" - "#TimedLogin=\n" - "#TimedLoginDelay=0\n" - "#InitialSetupEnable=true\n" - ;; Enable me once X is working. - "WaylandEnable=false\n" - "\n" - "[debug]\n" - "#Enable=true\n" - "\n" - "[security]\n" - "#DisallowTCP=true\n" - "#AllowRemoteAutoLogin=false\n")) - `(("gdm" ,(file-union - "gdm" - `(("custom.conf" ,gdm-configuration-file)))))) +(define (gdm-configuration-file config) + (mixed-text-file "gdm-custom.conf" + "[daemon]\n" + "#User=gdm\n" + "#Group=gdm\n" + (if (gdm-configuration-auto-login? config) + (string-append + "AutomaticLoginEnable=true\n" + "AutomaticLogin=" + (or (gdm-configuration-default-user config) + (error "missing default user for auto-login")) + "\n") + (string-append + "AutomaticLoginEnable=false\n" + "#AutomaticLogin=\n")) + "#TimedLoginEnable=false\n" + "#TimedLogin=\n" + "#TimedLoginDelay=0\n" + "#InitialSetupEnable=true\n" + ;; Enable me once X is working. + "WaylandEnable=false\n" + "\n" + "[debug]\n" + "#Enable=true\n" + "\n" + "[security]\n" + "#DisallowTCP=true\n" + "#AllowRemoteAutoLogin=false\n")) (define (gdm-pam-service config) "Return a PAM service for @command{gdm}." @@ -698,6 +694,9 @@ makes the good ol' XlockMore usable." "/bin/gdm")) #:environment-variables (list (string-append + "GDM_CUSTOM_CONF=" + #$(gdm-configuration-file config)) + (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config)) ;; XXX: GDM requires access to a handful of @@ -719,8 +718,6 @@ makes the good ol' XlockMore usable." (const %gdm-accounts)) (service-extension pam-root-service-type gdm-pam-service) - (service-extension etc-service-type - gdm-etc-service) (service-extension dbus-root-service-type (compose list gdm-configuration-gdm)))) From patchwork Wed Feb 13 19:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1078 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 A67DB16C17; Wed, 13 Feb 2019 19:30:25 +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 727B816C15 for ; Wed, 13 Feb 2019 19:30:25 +0000 (GMT) Received: from localhost ([127.0.0.1]:33997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Ej-0002RU-0G for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EU-0002Jf-5X for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu07e-0001D7-Qf for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu07b-0000xQ-5y for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu07b-0001ih-16 for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 2/8] gnu: gnome-session: Use absolute paths in .desktop files. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:23: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.15500857776574 (code B ref 34470); Wed, 13 Feb 2019 19:23:02 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:22:57 +0000 Received: from localhost ([127.0.0.1]:47318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07V-0001hx-95 for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:57 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07T-0001hd-Oz for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:56 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9C9CF24608; Wed, 13 Feb 2019 14:22:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:22:50 -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=xOEVe0I1XPP2qv+/Me0xmtUfAHpol0tOvkz3Yr1HIjU=; b=vDmjQF86 e+7tWUIfaScCruNZG/qc5LWxgkKYs3K/+EfIn2efuxrzlREHMxIcdRLBZYwl7/0h T0yeTv30nozP7MlvgLF7yZ0maYrz7PMuCKfNr/CYDoXzPvLEN/eA1/9VZvN8UHp0 wnbyCAglIHdSWVxreSgwyeSMVZQdZDV1uWGaXfQBtYxng2vQ+z6J1rabYDXXEYUi wE4hgQEyOZ48a6ui7hvGq0twPGcFuDa96XNBuzqLqud2X/ua+ru0oeXfeqlDjS7c EnVxcAMNHT9O6PybWk2E+nb580vpp6p4eiiFYqHYAltHUweG0D5PXtWAv1fHYFe2 6Ds8171nvmOgKA== 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 EC0EFE409D; Wed, 13 Feb 2019 14:22:49 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:15 -0500 Message-Id: <20190213192221.26599-2-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 This makes the gnome-session .desktop files usable even if gnome-session is not available from the PATH variable. * gnu/packages/gnome.scm (gnome-session)[arguments]: Add a phase that adds the absolute path of gnome-session in its .desktop files. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b2c7aa60cc..59e1011a8f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4575,6 +4575,14 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) + #t))) + (add-after 'install 'add-absolute-paths-to-desktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (map (lambda (x) + (string-append out "/share/xsessions/" x)) + '("gnome.desktop" "gnome-xorg.desktop")) + (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags 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) From patchwork Wed Feb 13 19:22:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1083 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 1765A16C17; Wed, 13 Feb 2019 19:32:26 +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 CFF9C16C15 for ; Wed, 13 Feb 2019 19:32:25 +0000 (GMT) Received: from localhost ([127.0.0.1]:34041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Gf-0003mI-E7 for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:32:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EN-00020A-Pn for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08a-00057x-Om for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08Z-0004yP-0z 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 1gu08Y-0001lQ-TE for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 4/8] gnu: gdm: Use absolute path for gnome-session. 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.15500857886660 (code B ref 34470); Wed, 13 Feb 2019 19:24:02 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:08 +0000 Received: from localhost ([127.0.0.1]:47328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07f-0001jL-99 for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:07 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:42293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07d-0001i7-6d for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 14CBF247EB; Wed, 13 Feb 2019 14:23:00 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:00 -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=ORzKtiIw7eAh10hvHqaNnI1894Drzy3VgDAbOl/vn+g=; b=IUw7py0n Hk2gznRUpTwjy4bMJPXht09A8sloQnyHwyPPdmKTgLJaXx6BUtFDKLt47zHETkaO fvzbwWPBHKvCNeTRoVSTLF7v7wyRrbNbYx2nhHvpKW6JHXGIqJf0DZkJ2hhITUKG 5YG8CE71QYdTL4i8Sef1JjcVNI+/0auKkqn/JokixEOeNBk+ranzaIiTZe24gAG/ 2fb6KUPWP0veV9XoTHpopak0NP03kjVorbbWWREgSQkNYp73h61yQbtxUjYt9o0I kLrHDsDHnxPQOO9wjetKmSwAFqxBMUJC3Sb0A0x8Wjs9+jR9RQSEAD54C0/JY4NT 6KPZoICdKVfIkQ== 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 9E853E4412; Wed, 13 Feb 2019 14:22:59 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:17 -0500 Message-Id: <20190213192221.26599-4-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]: Modify the pre-configure phase to substitute in the absolute path of gnome-session. [inputs]: Add gnome-session. --- gnu/packages/gnome.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac49ca7f2d..fdc5b68ef6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5349,7 +5349,7 @@ libxml2.") (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; We don't have . (substitute* '("common/gdm-log.c" "daemon/gdm-server.c" @@ -5410,6 +5410,11 @@ libxml2.") (substitute* '("daemon/gdm-x-session.c") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) + ;; Use an absolute path for GNOME Session. + (substitute* "daemon/gdm-launch-environment.c" + (("\"gnome-session\"") + (string-append "\"" (assoc-ref inputs "gnome-session") + "/bin/gnome-session\""))) #t)) ;; GDM needs GNOME Session to run these applications. We link ;; their autostart files in `share/gdm/greeter/autostart' @@ -5441,6 +5446,7 @@ libxml2.") `(("accountsservice" ,accountsservice) ("check" ,check) ; for testing ("elogind" ,elogind) + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) 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") From patchwork Wed Feb 13 19:22:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1081 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 BD12516C17; Wed, 13 Feb 2019 19:30:41 +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 69A6F16C15 for ; Wed, 13 Feb 2019 19:30:41 +0000 (GMT) Received: from localhost ([127.0.0.1]:34019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Ey-0002fZ-SI for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EM-00020A-Ku for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08a-00056S-Cg for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08a-00053M-1q 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-0001lf-Tj for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 6/8] gnu: gdm: Run dbus-daemon via a wrapper script. 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.15500857956695 (code B ref 34470); Wed, 13 Feb 2019 19:24:03 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:15 +0000 Received: from localhost ([127.0.0.1]:47336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07n-0001jv-HK for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:15 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07l-0001jS-89 for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:14 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2FCF324608; Wed, 13 Feb 2019 14:23:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:08 -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=FfBLhJ+x2z98o9h8F33JKk2+P8ACKEEPYO6vsZteZ7E=; b=gzbpk/UW D+VUHz8ovzcfEM72ylHRyjdLnttdGgzf8lkXB9tlf5hc8MyuVyn4YiA9QjKdrABI 2B6RdfVMs7iLhvkqrEJCLoVTd6Ax2y2tuk6xtyNiKcJEFKwqb4A4HKIg1+ATdyjA 4mQfAfQMy4iTfLdPuoCutOO0qltokrgb2oCrw75Io3AwcoWVsJFo7VN5R0TtAugL Bmk/G+MwsWcRE+4u+EuTRACarywkMxRXxZVVYfoHh6Lhgwc/GMQzvckZu4Z7SfEY TmspxU5hK+Tu3ztEkT7Zryh6KNLUJl05nj+q92ZS6cgl2nSGOQgvmdaL0F/0jHtD bjghUFPMPUwPSw== 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 C9BDEE423B; Wed, 13 Feb 2019 14:23:07 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:19 -0500 Message-Id: <20190213192221.26599-6-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]: Modify the pre-configure phase so that GDM propagates the GDM_DBUS_DAEMON variable into the session environment and uses its value to invoke dbus-daemon. * gnu/services/xorg.scm (dbus-daemon-wrapper): New variable. (): Add 'dbus-daemon' field. (gdm-shepherd-service): Set GDM_DBUS_DAEMON before invoking gdm. --- gnu/packages/gnome.scm | 3 +++ gnu/services/xorg.scm | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da1c976e07..3c09d6b30a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5379,6 +5379,7 @@ libxml2.") (("DATADIR \"/gnome") "\"/run/current-system/profile/share/gnome")) (let ((propagate '("GDM_CUSTOM_CONF" + "GDM_DBUS_DAEMON" "GDM_X_SERVER" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. @@ -5404,6 +5405,8 @@ libxml2.") (("\\(X_SERVER X_SERVER_ARG_FORMAT") "(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")")) (substitute* '("daemon/gdm-x-session.c") + (("\"dbus-daemon\"") + "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) ;; Use an absolute path for GNOME Session. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index de5438e3fe..6a589779b9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages display-managers) #:use-module (gnu packages gnustep) #:use-module (gnu packages gnome) @@ -623,12 +624,23 @@ makes the good ol' XlockMore usable." (home-directory "/var/lib/gdm") (shell (file-append shadow "/sbin/nologin"))))) +(define dbus-daemon-wrapper + (program-file "gdm-dbus-wrapper" + #~(begin + (setenv "XDG_CONFIG_DIRS" + "/run/current-system/profile/etc/xdg") + (setenv "XDG_DATA_DIRS" + "/run/current-system/profile/share") + (apply execl (string-append #$dbus "/bin/dbus-daemon") + (program-arguments))))) + (define-record-type* gdm-configuration make-gdm-configuration gdm-configuration? (gdm gdm-configuration-gdm (default gdm)) (allow-empty-passwords? gdm-configuration-allow-empty-passwords? (default #t)) (auto-login? gdm-configuration-auto-login? (default #f)) + (dbus-daemon gdm-configuration-dbus-daemon (default dbus-daemon-wrapper)) (default-user gdm-configuration-default-user (default #f)) (x-server gdm-configuration-x-server (default (xorg-wrapper)))) @@ -696,6 +708,9 @@ makes the good ol' XlockMore usable." (list (string-append "GDM_CUSTOM_CONF=" #$(gdm-configuration-file config)) + (string-append + "GDM_DBUS_DAEMON=" + #$(gdm-configuration-dbus-daemon config)) (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config)) From patchwork Wed Feb 13 19:22:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1079 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 BB03616C18; Wed, 13 Feb 2019 19:30:29 +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 5EE0916C16 for ; Wed, 13 Feb 2019 19:30:29 +0000 (GMT) Received: from localhost ([127.0.0.1]:34011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Em-0002XF-T0 for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EL-00020B-EE for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08a-00057q-OT for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08a-000578-HO 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 1gu08a-0001ln-BZ for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 7/8] services: gdm: Make dependencies explicit. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:04 +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.15500857986710 (code B ref 34470); Wed, 13 Feb 2019 19:24:04 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:18 +0000 Received: from localhost ([127.0.0.1]:47340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07p-0001kA-SX for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:18 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07n-0001jc-Sp for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:16 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CC8E224808; Wed, 13 Feb 2019 14:23:10 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:10 -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=bgVBgsalaIxZjiETaZ8cmlQhADaabUxB4h1KzlF8rMk=; b=qVfnM/4h MbLMtZ7E9NBlMM/rp5hWDzJoK/D+/Ocij45izsJCsPgkY37qB5Sl8eQOXVdPTkA2 dBC12nA71ws3wsM/tZ7duoMOyldCFv+At6h3hWgsbvEEZCR24h1HLy+2Oo+mWRNd Q+X1PXG6HSuLxRE2ZuHnhE8p7AYG79nyahM9kui8j4zEPqBzBp2fTjgDK5T6l4IO hAjfIFFJ873RE/PxGLE3dWl5zil6m1zFVBBzVCRnUViGyHTm2KlS6oiiFqKrDABZ YKvijzg+XlF7Haz7MmZt6TpCKDOw8fgMjrXu5CCJwzW/Lha90yhJPRsOJSCY/9ZA uTNsZhyPF//RPA== 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 5A801E409D; Wed, 13 Feb 2019 14:23:10 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:20 -0500 Message-Id: <20190213192221.26599-7-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 This commit removes the remaining implicit dependencies that the GDM service had on the GNOME Desktop service. * gnu/services/xorg.scm (gdm-configuration): Add a gnome-shell-assets field for specifying any icons or fonts that the GNOME Shell theme needs. (gdm-shepherd-service): Remove environment variables pointing to '/run/current-system' and set XDG_DATA_DIRS so that it points to 'gnome-shell' and its assets. (gdm-service-type): Extend 'profile-service-type' to ensure that necessary fonts are installed in the system profile. --- gnu/services/xorg.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 6a589779b9..4e6f5ad44f 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -28,6 +28,7 @@ #:use-module ((gnu packages base) #:select (canonical-package)) #:use-module (gnu packages guile) #:use-module (gnu packages xorg) + #:use-module (gnu packages fonts) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages display-managers) @@ -642,6 +643,8 @@ makes the good ol' XlockMore usable." (auto-login? gdm-configuration-auto-login? (default #f)) (dbus-daemon gdm-configuration-dbus-daemon (default dbus-daemon-wrapper)) (default-user gdm-configuration-default-user (default #f)) + (gnome-shell-assets gdm-configuration-gnome-shell-assets + (default (list adwaita-icon-theme font-cantarell))) (x-server gdm-configuration-x-server (default (xorg-wrapper)))) @@ -714,13 +717,16 @@ makes the good ol' XlockMore usable." (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config)) - ;; XXX: GDM requires access to a handful of - ;; programs and components from Gnome (gnome-shell, - ;; dbus, and gnome-session among others). The - ;; following variables only work provided Gnome is - ;; installed. - "XDG_DATA_DIRS=/run/current-system/profile/share" - "PATH=/run/current-system/profile/bin")))) + (string-append + "XDG_DATA_DIRS=" + ((lambda (ls) (string-join ls ":")) + (map (lambda (path) + (string-append path "/share")) + ;; XXX: Remove gnome-shell below when GDM + ;; can depend on GNOME Shell directly. + (cons #$gnome-shell + '#$(gdm-configuration-gnome-shell-assets + config))))))))) (stop #~(make-kill-destructor)) (respawn? #t)))) @@ -733,6 +739,8 @@ makes the good ol' XlockMore usable." (const %gdm-accounts)) (service-extension pam-root-service-type gdm-pam-service) + (service-extension profile-service-type + gdm-configuration-gnome-shell-assets) (service-extension dbus-root-service-type (compose list gdm-configuration-gdm)))) From patchwork Wed Feb 13 19:22:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1077 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 DA93E16C17; Wed, 13 Feb 2019 19:30:14 +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 829AB16C15 for ; Wed, 13 Feb 2019 19:30:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:33972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EX-0002Fp-7u for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EL-00020A-DZ for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu08c-0005GX-8B for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu08b-00058n-1v for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu08a-0001lu-SD for guix-patches@gnu.org; Wed, 13 Feb 2019 14:24:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 8/8] services: gdm: Allow for custom X session scripts. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:24:04 +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.15500858016725 (code B ref 34470); Wed, 13 Feb 2019 19:24:04 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:23:21 +0000 Received: from localhost ([127.0.0.1]:47344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07t-0001kP-7Q for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:21 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07r-0001jn-A9 for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:23:19 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 40A46247E5; Wed, 13 Feb 2019 14:23:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:23:14 -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=1W6e9WQpmaLAD3CB7vrd9z7l3Oik/KfPa+4krzq6IBo=; b=Dvebo0Wp H/lS9sEWkqNE1O/vKaQ0Q48MBCt0JOJf+ztYn6YJymOWhZTkrsIO4mNS+VEVnWUy Fi5F7yDSlGcE+QHtML7ZkWTx8ox+0sBp3PNI5EWG17VI+X/faEEnS7ayL/NOG0QM IkxXNCUTvuenPQvVH8bLXaHPUlAw3RWIzi+OlyJOhBzVnCwbiDS3g/mcE6pe5HO3 VdF+leJsMuTnDoihkIkzlquevcOzT9uMdgUES4Mt5jS2QQGBRLHX3dI/G4CIozBc /Kc7tYW3E6MqJ2OZcccmY9ferbcf9P/DBFrPbNM82TPE/2Oect5/8gUZLTQ/zaTF tb+hXWL9FykqQg== 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 B287DE4662; Wed, 13 Feb 2019 14:23:13 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:21 -0500 Message-Id: <20190213192221.26599-8-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]: Update pre-configure phase so that GDM runs an X session script specified by the variable GDM_X_SESSION; remove the '--enable-gdm-xsession' configuration option. * gnu/services/xorg.scm (): Add 'x-session' field. (gdm-shepherd-service): Set the GDM_X_SESSION variable. --- gnu/packages/gnome.scm | 9 ++++----- gnu/services/xorg.scm | 7 ++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c09d6b30a..a4563617d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5328,10 +5328,6 @@ libxml2.") ;; service for TTY 1 before starting GDM). "--with-initial-vt=7" - ;; By default, GDM expects distributions to install a custom Xsession - ;; script. It provides a generic one if --enable-gdm-xsession is set. - "--enable-gdm-xsession" - ;; Use '/etc/environment' for locale settings instead of the ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" @@ -5381,6 +5377,7 @@ libxml2.") (let ((propagate '("GDM_CUSTOM_CONF" "GDM_DBUS_DAEMON" "GDM_X_SERVER" + "GDM_X_SESSION" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. "XDG_DATA_DIRS"))) @@ -5408,7 +5405,9 @@ libxml2.") (("\"dbus-daemon\"") "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") - "g_getenv (\"GDM_X_SERVER\")")) + "g_getenv (\"GDM_X_SERVER\")") + (("GDMCONFDIR \"/Xsession\"") + "g_getenv (\"GDM_X_SESSION\")")) ;; Use an absolute path for GNOME Session. (substitute* "daemon/gdm-launch-environment.c" (("\"gnome-session\"") diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 4e6f5ad44f..f7d07b309e 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -646,7 +646,9 @@ makes the good ol' XlockMore usable." (gnome-shell-assets gdm-configuration-gnome-shell-assets (default (list adwaita-icon-theme font-cantarell))) (x-server gdm-configuration-x-server - (default (xorg-wrapper)))) + (default (xorg-wrapper))) + (x-session gdm-configuration-x-session + (default (xinitrc)))) (define (gdm-configuration-file config) (mixed-text-file "gdm-custom.conf" @@ -717,6 +719,9 @@ makes the good ol' XlockMore usable." (string-append "GDM_X_SERVER=" #$(gdm-configuration-x-server config)) + (string-append + "GDM_X_SESSION=" + #$(gdm-configuration-x-session config)) (string-append "XDG_DATA_DIRS=" ((lambda (ls) (string-join ls ":"))