From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mCaeAvwkuGXDdQAAqHPOHw:P1 (envelope-from ) for ; Mon, 29 Jan 2024 23:21:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mCaeAvwkuGXDdQAAqHPOHw (envelope-from ) for ; Mon, 29 Jan 2024 23:21:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=a1dGwDU4; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706566907; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=knxD79jZK2aBvmjOJguF5Wd0ZK5653BlngdyRKaEcJ8=; b=sPFFAMDcNHEwn4Nqaf7qjECbfJ+g51klLecOUwPOjkbq8oGfR6UocZ/zh2h5Vo5wWe5gdq rgtzIpOrDhctddZeW7HdSMql31R19Mm1qHXJSsI+12aFl8KoP82SY1wajju0uohyGoCSOc amBndeA2GyDUSFNRBeQ1dmlj05Ss7LWuT3cUulYHL23e4Mu2+i9PdgwePTHa8PZDihDLJe ikcdEH5We5tZiIMihgBnwMscHeQAEQgE+r99Y8lvdCpvpFC0yu2xdkLBxEtAdQSQy1SzE2 rOWuRJB89Dul3hAjuE0njSxYBJLfwCA098Fa15cK2HVp/H0YYToZ1C0LA+GR+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=a1dGwDU4; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706566907; a=rsa-sha256; cv=none; b=W0kegwgm4lKdNsk7fhPjEmTIvRiXB5Mi54VTWDX5hNvLIlDkyOF4+E2VqQZsrw40qGLLKQ a2pbVUhK9qfwEKtpxBOPENgDiuXbETL2OuA39qoSqlhW4tSn32UKRTN0KVDJvdLRej6Tan 3KfuPFS9DNDhXjhDxtPLifVwO+mp06eDKwJsJB7uRJrwUxkU9yc98JsudYAJ59g9za0sN/ JSwp7Wn24IjiP1PEGtsxoFw7niFK1EU0+Yf20j+eEsYETVgWZDdbtS+IUgmTaJEnpWH2O+ /q+vIiRG6i0V6dfGErLhE4eNYszAdWOxKXdsZp9KulmJkm52Tbu28t7wutbl2w== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CB4CE539D9 for ; Mon, 29 Jan 2024 23:21:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUZgh-0006ej-0C; Mon, 29 Jan 2024 17:01:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUZgX-0006dd-60 for bug-guix@gnu.org; Mon, 29 Jan 2024 17:01:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rUZgV-0005i3-2M for bug-guix@gnu.org; Mon, 29 Jan 2024 17:00:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUZgb-00070n-QE; Mon, 29 Jan 2024 17:01:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#57292: [PATCH] WIP: gnu: propagate inputs for gdm and rework gdm-service-type. References: <87v8qpyocr.fsf@gmail.com> In-Reply-To: <87v8qpyocr.fsf@gmail.com> Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, bug-guix@gnu.org Resent-Date: Mon, 29 Jan 2024 22:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57292 X-GNU-PR-Package: guix X-GNU-PR-Keywords: moreinfo To: 57292@debbugs.gnu.org Cc: 59489@debbugs.gnu.org, Dariqq , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus Received: via spool by 57292-submit@debbugs.gnu.org id=B57292.170656566026939 (code B ref 57292); Mon, 29 Jan 2024 22:01:01 +0000 Received: (at 57292) by debbugs.gnu.org; 29 Jan 2024 22:01:00 +0000 Received: from localhost ([127.0.0.1]:33618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUZgZ-00070L-Cq for submit@debbugs.gnu.org; Mon, 29 Jan 2024 17:00:59 -0500 Received: from mout02.posteo.de ([185.67.36.66]:44547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUZgW-0006zz-5j for 57292@debbugs.gnu.org; Mon, 29 Jan 2024 17:00:57 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 854A5240103 for <57292@debbugs.gnu.org>; Mon, 29 Jan 2024 23:00:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1706565641; bh=FHHykdCoiwMNOPY1PvuwlIdxnyKohlijVZyAiCwheHw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=a1dGwDU4XDzBelQ/i2ZEqKZaZuO0THy4BEgikKcABxdDiDp0PWVlVN4WgihR8bS97 XQ33RT1PIuZRlAthdDhbwwQopuzFX+NJzZSjgRkYy7hesh2pPXnICM840oMlEPGooq bEDMyHKCQdIGpZcvoAXr5uZM3uPO6bbDyEItzcPPbphWVK4IR51bGdN5FP3D0kHhYs T35c0ZD4ibBtQGxrWWXU30dF4x8khNKRnLNXh2FqFoCU+ZG9izwHJBbx9vw91QkGia cEpYNjcOsBfc7jJxqFgB60egiY3P/iX0fEt3gJyYWFYpBR0SNa9rl4tFFDLDQF58qh MUyOYNaEJJuZQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TP2L05gR5z9rxD; Mon, 29 Jan 2024 23:00:40 +0100 (CET) From: Dariqq Date: Mon, 29 Jan 2024 21:31:25 +0000 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 5.15 X-Migadu-Scanner: mx13.migadu.com X-Spam-Score: 5.15 X-Migadu-Queue-Id: CB4CE539D9 X-TUID: 0b0xCZS8ItpH * gnu/packages/gnome.scm (gdm)[propagated inputs]: Add adwaita-icon-theme, dconf, font-abattis-cantarell, gnome-control-center. * gnu/services/xorg.scm (gdm-shepherd-service): Set XDG_DATA_DIR to run/current-system/profile/share. (gdm-profile-service): New variable. (gdm-service-type): Use gdm-profile-service. (gdm-configuration-gnome-shell-assets): Set default to gnome-shell. Change-Id: I870206a9ee6a7481d19e6b38b6a3ee72b5801c6a --- Hi Maxim and others, This is not quite the explicit wrapper we talked about on IRC but something similiar. The gdm package now propagates the packages from gnome-shell-assets and I added dconf and gnome-control-center for basic accessibility settings functionality + icon. Does this introduce a problem as dconf is already a natice input? Maybe also some other packages can be added like at-spi2-core, orca, ... or is this something the user should add to the system profile themselves? In order for the gdm-shepherd-service to find the propagated packages I changed the XDG_DATA_DIR of the service to the system profile and added a gdm-profile-service to add gdm and gnome-shell to the system profile. Probably the gnome-shell-assets name should now also be changed as is is now only the gnome-shell package. What do you think? gnu/packages/gnome.scm | 5 +++++ gnu/services/xorg.scm | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f22529dd7..c16079da0a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9020,6 +9020,11 @@ (define-public gdm libcanberra libgudev linux-pam)) + (propagated-inputs + (list adwaita-icon-theme + dconf + font-abattis-cantarell + gnome-control-center)) (synopsis "Display manager for GNOME") (home-page "https://wiki.gnome.org/Projects/GDM/") (description diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 1ee15ea90c..8b360d7729 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -1039,7 +1039,9 @@ (define-record-type* (debug? gdm-configuration-debug? (default #f)) (default-user gdm-configuration-default-user (default #f)) (gnome-shell-assets gdm-configuration-gnome-shell-assets - (default (list adwaita-icon-theme font-abattis-cantarell))) + ;; XXX: Remove gnome-shell below when GDM + ;; can depend on GNOME Shell directly. + (default (list gnome-shell))) (xorg-configuration gdm-configuration-xorg (default (xorg-configuration))) (x-session gdm-configuration-x-session @@ -1136,6 +1138,10 @@ (define (gdm-pam-service config) #:allow-empty-passwords? (gdm-configuration-allow-empty-passwords? config)))) +(define (gdm-profile-service config) + (cons* (gdm-configuration-gdm config) + (gdm-configuration-gnome-shell-assets config))) + (define (gdm-shepherd-service config) (define config-file (gdm-configuration-file config)) @@ -1164,15 +1170,7 @@ (define (gdm-shepherd-service config) "GDM_X_SESSION=" #$(gdm-configuration-x-session config)) (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))))) + "XDG_DATA_DIRS=/run/current-system/profile/share") ;; Add XCURSOR_PATH so that mutter can find its ;; cursors. gdm doesn't login so doesn't source ;; the corresponding line in /etc/profile. @@ -1237,7 +1235,7 @@ (define gdm-service-type (service-extension polkit-service-type gdm-polkit-rules) (service-extension profile-service-type - gdm-configuration-gnome-shell-assets) + gdm-profile-service) (service-extension dbus-root-service-type (compose list gdm-configuration-gdm)) base-commit: 21e4d6cd6913eca131f2c0fd0cd509fc843c7eb8 -- 2.41.0