From patchwork Fri Sep 23 05:00:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42865 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 CFDF727BBEA; Fri, 23 Sep 2022 06:05:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F10727BBE9 for ; Fri, 23 Sep 2022 06:05:11 +0100 (BST) Received: from localhost ([::1]:41314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obas9-0004wc-9D for patchwork@mira.cbaines.net; Fri, 23 Sep 2022 01:05:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obapA-0003VE-Ri for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obapA-000263-JW for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obapA-000550-Dm for guix-patches@gnu.org; Fri, 23 Sep 2022 01:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58014] [PATCH 06/15] gnu: gdm: Patch an extra reference to the Xsession script. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Sep 2022 05:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58014@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58014-submit@debbugs.gnu.org id=B58014.166390928219363 (code B ref 58014); Fri, 23 Sep 2022 05:02:04 +0000 Received: (at 58014) by debbugs.gnu.org; 23 Sep 2022 05:01:22 +0000 Received: from localhost ([127.0.0.1]:39014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obaoT-000529-FL for submit@debbugs.gnu.org; Fri, 23 Sep 2022 01:01:21 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:45859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obaoQ-00051T-DH for 58014@debbugs.gnu.org; Fri, 23 Sep 2022 01:01:18 -0400 Received: by mail-qv1-f48.google.com with SMTP id mi14so8252595qvb.12 for <58014@debbugs.gnu.org>; Thu, 22 Sep 2022 22:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=CaQmioIJ6LZ4K3Z8hf0hBfPSuZTrlpwCnno+ez1/itM=; b=lU8XQz9rIQHpEkDAQ66pDODWR+NUSTC3foSRabjJLCDY/SIf3ApuX88dcgmLt2n4XJ gbaqgrrRwDGYVecJK2OSZJe8nQopcTVeEIIAiHCzZ/7sxTITAAFY2UvkBWDJG+xhJq/R MM1nXSMesLf2NYlKwq02HdcedQLxbYngu9tdiLHiIVl2RvchuIUIohJ60k9wzEbX+eJV YFg3Vp06cvaw6hh6+D3TpaAdr8DOA+aGklECyJ4y/+kcTAOxFFv24yyv94D/kDmhETTd vcoEDDmEUisOIBvWImZ5GHbzFro7MBG8b9ofaLfqtVFQKyyNNBm9bZLj6mx0YxtbbfLh TK7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=CaQmioIJ6LZ4K3Z8hf0hBfPSuZTrlpwCnno+ez1/itM=; b=jA/wX/8ozDL0R80/frJwqmMQInPyCByyvpaNLzJ+VPRN2+XNG42I75dKNhTE+ddlYJ owcS8WkIorj8g86FK111Y7cJh70PktjWCPgDePOSPnv9I8LPFF63OsMCyEMyrk7ILylA ClPKIfminEhavaK+mKJ9jmvdaeeKmTcxVLVC6q+1Z0TYZ/7lS6CZkGR8o0apbIGNNEPw VPrYTtlFHs67XFr+fAgMsi8wlEpXqkYH0xy9kQFNxU5Ycbocmo7gt/SW/ZL4sgqLH+zQ vR3shCK1A2nrRWU2C1SiZ9ZLKk6evYbombcZHefv2/rLvRaBYPXb1D/TNoc7KL1IsPHY pFkw== X-Gm-Message-State: ACrzQf3qYPPUSZ0pIQr9NDD2wXA8e7YSQmtjaKVVba82GRbdoVPTLsG/ c5RDJI/X6n+Y2qiWENT2kjf8OIMXtGM= X-Google-Smtp-Source: AMsMyM4zaZSx5JbPVzMo8iWCxbZ41Nb+AAifh6AHIYZejUp+rNTyW+uWEpqqzONNCy056nHKDMhGGA== X-Received: by 2002:a05:6214:c44:b0:4ac:ad73:4c6a with SMTP id r4-20020a0562140c4400b004acad734c6amr5249876qvj.14.1663909272861; Thu, 22 Sep 2022 22:01:12 -0700 (PDT) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id de4-20020a05620a370400b006bbb07ebd83sm5263534qkb.108.2022.09.22.22.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 22:01:12 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 Sep 2022 01:00:33 -0400 Message-Id: <20220923050042.29893-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220923050042.29893-1-maxim.cournoyer@gmail.com> References: <20220923050042.29893-1-maxim.cournoyer@gmail.com> 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 Without this change, attempting to start a remote session over VNC would fail with: Sep 19 19:54:04 localhost gdm-session-worker: Gdm: GdmSessionWorker: child '/gnu/store/yy9wq647l37658vgi291a287ll9iw6dc-gdm-42.0/etc/gdm/Xsession' could not be started: No such file or directory * gnu/packages/gnome.scm (gdm)[phases]{patch-paths} : Patch a reference in so the Xsession script is correctly found via the GDM_X_SESSION environment variable. --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0adb065eb5..facc8515f5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8830,7 +8830,10 @@ (define-public gdm "gdm_session_set_environment_variable " "(self, \"" name "\"," "g_getenv (\"" name "\"));\n")) - propagate))))) + propagate))) + ;; This is used by remote sessions, such as when using VNC. + (("\\(GDMCONFDIR \"/Xsession \\\\\"%s\\\\\"\", command)") + "(\"%s \\\"%s\\\"\", g_getenv (\"GDM_X_SESSION\"), command)"))) ;; Find the configuration file using an environment variable. (substitute* '("common/gdm-settings.c") (("GDM_CUSTOM_CONF")