From patchwork Mon Feb 7 09:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 37058 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 607FF27BBEA; Mon, 7 Feb 2022 10:16:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 2C03827BBE9 for ; Mon, 7 Feb 2022 10:16:34 +0000 (GMT) Received: from localhost ([::1]:35518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH14R-0003Mu-Hk for patchwork@mira.cbaines.net; Mon, 07 Feb 2022 05:16:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH00C-00068O-7u for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH00B-0004La-R3 for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nH00B-0002vR-NM; Mon, 07 Feb 2022 04:08:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53818] [PATCH v2 7/7] gnu: xorg-server-xwayland: Prepare for cross-compilation. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: maximedevos@telenet.be, guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 09:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53818@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-Xcc: Maxime Devos Received: via spool by 53818-submit@debbugs.gnu.org id=B53818.164422484311151 (code B ref 53818); Mon, 07 Feb 2022 09:08:03 +0000 Received: (at 53818) by debbugs.gnu.org; 7 Feb 2022 09:07:23 +0000 Received: from localhost ([127.0.0.1]:40934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzX-0002tn-5h for submit@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:23 -0500 Received: from h178-251-242-94.cust.a3fiber.se ([178.251.242.94]:55312 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzV-0002sx-QS for 53818@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:22 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yoctocell.xyz; s=mail; t=1644224836; bh=jfMlwFd48Ue03So3eKlueTE4uUT6FJ2S6vUX3eqQoKo=; h=From:To:Subject:In-Reply-To:References:Date; b=EM/pOGv/fsf2Y+ulVfhRID8ieg60TGeCzr1YrFFjXMYbLTNHSytSrRmjr2Uj+UJAc W0zSEFmnvDlFkrpOHQNqXBS3C23Soi5Z6Hm9we9uFFwnSEhU3R6SfWQtBbmFLiWNIc 4jqSYU/ibyy13bkxqRLT+mBb6WNurhwzkUQLUelc= In-Reply-To: References: Message-Id: Date: Mon, 07 Feb 2022 10:07:16 +0100 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 * gnu/packages/xorg.scm (xorg-server-xwayland)[arguments]<#:phases>: Use ‘search-input-file’ instead of ‘which’. --- gnu/packages/xorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8be7017da7..dea7268a2e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5518,9 +5518,10 @@ (define-public xorg-server-xwayland "--localstatedir=/var") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-/bin/sh - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files "." "\\.c$") - (("/bin/sh") (which "sh")))))))) + (("/bin/sh") + (search-input-file inputs "bin/sh")))))))) (properties '((repology-name . "xwayland"))) (synopsis "Xorg server with Wayland backend")