From patchwork Fri Jul 2 10:07:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 31015 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 4BEAA27BC81; Fri, 2 Jul 2021 11:37:40 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, 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 207E927BC78 for ; Fri, 2 Jul 2021 11:37:40 +0100 (BST) Received: from localhost ([::1]:48734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGYF-0008Aa-4n for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzGXi-0007R4-9d for guix-patches@gnu.org; Fri, 02 Jul 2021 06:37:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzGXi-0003bi-1A for guix-patches@gnu.org; Fri, 02 Jul 2021 06:37:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzGXh-0003Ro-Vi for guix-patches@gnu.org; Fri, 02 Jul 2021 06:37:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 091/128] gnu: lightdm: Explicitely use a native 'bash' for 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.162522219413015 (code B ref 49327); Fri, 02 Jul 2021 10:37:05 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:36:34 +0000 Received: from localhost ([127.0.0.1]:34968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzGXC-0003Nl-7l for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:36:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6j-0008Bx-OJ for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:14 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A9DJX; Fri, 02 Jul 2021 12:09:13 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:07:37 +0200 Message-Id: <20210702100814.23249-91-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702100814.23249-1-maximedevos@telenet.be> References: <20210702100814.23249-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220553; bh=vvTmVS7lR013atOjX6ldfuaIYyDg1PGn3KlrhgUTl2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YCH39n3l6AnnItXPVw2yW7LcSZI9N3XgMQQ1JD0pJ3Hxo57AQJK4ZeC+28MuVs9K6 9Q+0wi5NZW8JwXtO4SzXssKiIV3xNqXBB7VTMEF5PjncR7z7DVt0PrBKcYWuZguDkr JD2EtzZMsFKhK7YggbLbYabIOOg7QVDSpnMBkojZWHo6nUjgwSPBsytGjSJ/qmJCPI hGf15vlqQL/mUJbbMJqSi4LvWscEElO9SVYaGOV/0u7CRPVxzDQ7UeWtuXmg+J+lco JZQo378XOKgA2rgmhw1Lh9T2I/R7xuvSGLHyXI6kAWhMuwklXsE+YcVHLkFArEGv9K sBBvqkO/I6iXA== 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 Having to use a native bash for 'wrap-program' is fairly unusual, but here it is the right thing, as it is for the test suite only. Placate the 'wrapper-inputs' linter. Also, eventually we might consider letting 'wrap-program' bail out if no bash for the host is found, even when compiling natively. But that's for later. * gnu/packages/display-managers.scm (lightdm)[arguments]<#:phases>{pre-check}: Set #:sh argument of 'pre-check' --- gnu/packages/display-managers.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 264ad34ba3..0af00163cf 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -223,6 +223,7 @@ easy to use, login interface with a modern yet classy touch.") ;; Run test-suite under a dbus session. (lambda* (#:key inputs #:allow-other-keys) (wrap-program "tests/src/test-python-greeter" + #:sh (which "bash") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))