From patchwork Wed May 8 18:59:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 13933 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 01B5416FDE; Wed, 8 May 2019 20:01:10 +0100 (BST) 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 C27C216FDB for ; Wed, 8 May 2019 20:01:07 +0100 (BST) Received: from localhost ([127.0.0.1]:42010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hORoQ-0003Cn-6b for patchwork@mira.cbaines.net; Wed, 08 May 2019 15:01:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hORoN-0003BD-5r for guix-patches@gnu.org; Wed, 08 May 2019 15:01:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hORoL-0005Xl-W5 for guix-patches@gnu.org; Wed, 08 May 2019 15:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48719) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hORoL-0005Xf-Rr for guix-patches@gnu.org; Wed, 08 May 2019 15:01:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hORoL-0001Ne-NB for guix-patches@gnu.org; Wed, 08 May 2019 15:01:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35641] [PATCH] services: gdm: Include user profile in D-Bus paths. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 May 2019 19:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35641@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15573420055163 (code B ref -1); Wed, 08 May 2019 19:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 May 2019 19:00:05 +0000 Received: from localhost ([127.0.0.1]:34029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hORnQ-0001LC-RK for submit@debbugs.gnu.org; Wed, 08 May 2019 15:00:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hORnO-0001Jx-GT for submit@debbugs.gnu.org; Wed, 08 May 2019 15:00:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:45557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hORnJ-00051p-9z for submit@debbugs.gnu.org; Wed, 08 May 2019 14:59:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hORnI-0002kz-2R for guix-patches@gnu.org; Wed, 08 May 2019 14:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hORnG-000511-MM for guix-patches@gnu.org; Wed, 08 May 2019 14:59:55 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56579) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hORnG-0004zv-DJ for guix-patches@gnu.org; Wed, 08 May 2019 14:59:54 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E9C05238EF for ; Wed, 8 May 2019 14:59:51 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 08 May 2019 14:59:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=aeRKwV0Zw+lG92WnjeWI4tgK9IVc+ bOu0FGdNYvNg5E=; b=WAoUhkIA//ZqT1+mII8W6VHe0i2yDrMQLipE0dX+Lk+9+ YO8+DRmZiGQGp+hiCOBNLUM9uwDePpQVrWpSoxw85jb3EixxMQgelyb7bm4q73g0 Qmxky3zW6jVo9xvqUOb8dNmRuS8Mi1XSTkOc9bYqETGv/G4QNDCn1Y4z0RIdZ8+0 qxI8HKKDiWtJPDMUX+wxRlATsXk/9yP4Qo2fdjJyTSEoQHHaXWtDcqVLJcbv7Khk Z/JcAkT0A84zMQXfBrs7QP3DpJxBLQ4JxYESyvm3YbND6gheeIa2STkR0g67INlM JvE74Ey8x0exrS/wCvhV5Y5u7rBbDU0Or/aHbAkVw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrkeefgddufedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkfgggtgesmhdtreertd erjeenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhg hihrohdrtghomheqnecukfhppeejgedrudduiedrudekiedrgeegnecurfgrrhgrmhepmh grihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhmnecuvehluhhsthgvrhfu ihiivgeptd X-ME-Proxy: Received: from mrblack (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id 67568103CF for ; Wed, 8 May 2019 14:59:51 -0400 (EDT) From: Timothy Sample Date: Wed, 08 May 2019 14:59:50 -0400 Message-ID: <87v9yksrfd.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 Hi Guix, I avoided doing this when fixing up GDM because it seemed a little ham-fisted (clumsy). However, I think it is better than all the ink that would be spilled on help-guix without it. In short, the point is to make sure that D-Bus services included in a user’s profile can be found and started by the session bus. This means that if you are using GDM and install “evolution-data-server” and “gnome-calendar” (for example), the session bus will be able to start all of the services that GNOME Calendar needs to function correctly. There are a handful of major GNOME applications that need this. Furthermore, I think we should add “evolution-data-server” as a propagated input for packages that require it. This way, things like “guix install evolution” will just work the way one expects. Is it okay to assume that “.guix-profile” is the user’s profile like this? If it isn’t okay in general, is it okay enough for now? From e32c27dfa950d250520c3c8ecccba90add863639 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 8 May 2019 09:13:14 -0400 Subject: [PATCH] services: gdm: Include user profile in D-Bus paths. This partially addresses . * gnu/services/xorg.scm (dbus-daemon-wrapper): When '$HOME' is set, include directories from '$HOME/.guix-profile' in the search paths of the D-Bus daemon. --- gnu/services/xorg.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 65e9d48915..027524f11d 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -767,14 +767,24 @@ the GNOME desktop environment.") (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))))) + (program-file + "gdm-dbus-wrapper" + #~(begin + (use-modules (srfi srfi-26)) + (let* ((system-profile "/run/current-system/profile") + (user-profile (and=> (getenv "HOME") + (cut string-append <> "/.guix-profile"))) + (profiles (if user-profile + (list user-profile system-profile) + (list system-profile)))) + (setenv "XDG_CONFIG_DIRS" + (string-join (map (cut string-append <> "/etc/xdg") profiles) + ":")) + (setenv "XDG_DATA_DIRS" + (string-join (map (cut string-append <> "/share") profiles) + ":")) + (apply execl (string-append #$dbus "/bin/dbus-daemon") + (program-arguments)))))) (define-record-type* gdm-configuration make-gdm-configuration -- 2.21.0