From patchwork Wed Sep 29 11:20:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 33416 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 5613827BBE3; Wed, 29 Sep 2021 12:22:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A2BA27BBE1 for ; Wed, 29 Sep 2021 12:22:19 +0100 (BST) Received: from localhost ([::1]:53548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVXfG-0003lT-4p for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 07:22:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVXf0-0003l9-Ha for guix-patches@gnu.org; Wed, 29 Sep 2021 07:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVXf0-0006mN-6l for guix-patches@gnu.org; Wed, 29 Sep 2021 07:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVXf0-000781-28 for guix-patches@gnu.org; Wed, 29 Sep 2021 07:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50563] [PATCH [0/2] gnu: GDM: Add Wayland support Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 11:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50563 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 50563@debbugs.gnu.org Received: via spool by 50563-submit@debbugs.gnu.org id=B50563.163291447727345 (code B ref 50563); Wed, 29 Sep 2021 11:22:02 +0000 Received: (at 50563) by debbugs.gnu.org; 29 Sep 2021 11:21:17 +0000 Received: from localhost ([127.0.0.1]:47894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVXeG-00076z-Uu for submit@debbugs.gnu.org; Wed, 29 Sep 2021 07:21:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVXeB-00076i-J5 for 50563@debbugs.gnu.org; Wed, 29 Sep 2021 07:21:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52308) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVXe5-00069Y-EK; Wed, 29 Sep 2021 07:21:05 -0400 Received: from [46.183.103.8] (port=19033 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVXe2-0000P8-IG; Wed, 29 Sep 2021 07:21:04 -0400 From: Mathieu Othacehe References: Date: Wed, 29 Sep 2021 11:20:58 +0000 In-Reply-To: (Josselin Poiret's message of "Mon, 13 Sep 2021 07:35:29 +0000") Message-ID: <87tui31vc5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 Hello Josselin, > This is my first contribution, so do not hesitate to give any feedback > (I also haven't setup `git send-email` yet so this is a manual mail). Thanks for this first contribution! I was able to apply the patches just fine. However, it would nice if you could write commit messages respecting the ChangeLog format as explained here: https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html. > 1. Enables optional support for launching a Wayland GDM session. > 2. Adds a wrapper for Wayland sessions in order to setup the > environment, similar to the default `/etc/profile` or `xinitrc`. I tried to apply both patches on top of the wip-gnome40 branch to see if I can get Wayland support. There are minor merge conflicts that are solved on the wip-gnome40-wayland branch. I then edited the desktop.tmpl file this way: --8<---------------cut here---------------start------------->8--- --8<---------------cut here---------------end--------------->8--- And tested it by running: --8<---------------cut here---------------start------------->8--- $(./pre-inst-env guix system vm gnu/system/examples/desktop.tmpl --no-grafts --no-offload -v3 -K) -m 2048 --8<---------------cut here---------------end--------------->8--- Looks like there's a good old xorg-server running, plus the "About" section in GNOME configuration reports that it is running using the X11 window system. Anything wrong with my integration? Thanks, Mathieu --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -64,12 +64,15 @@ ;; by clicking the gear. Use the "desktop" services, which ;; include the X11 log-in service, networking with ;; NetworkManager, and more. - (services (append (list (service gnome-desktop-service-type) - (service xfce-desktop-service-type) - (set-xorg-configuration - (xorg-configuration - (keyboard-layout keyboard-layout)))) - %desktop-services)) + (services (modify-services + (append (list (service gnome-desktop-service-type) + (set-xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout)))) + %desktop-services) + (gdm-service-type config => + (gdm-configuration + (wayland? #t))))) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss))