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))))