From patchwork Wed Sep 29 22:19:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33449 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 C612127BBE3; Wed, 29 Sep 2021 23:24:16 +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,RCVD_IN_MSPIKE_H2,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 8D3AB27BBE1 for ; Wed, 29 Sep 2021 23:24:16 +0100 (BST) Received: from localhost ([::1]:50892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzr-0003hw-Jx for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0007CU-AZ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhww-0002FP-RA for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhww-0000mF-N3 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540362676 (code B ref 50905); Wed, 29 Sep 2021 22:21:14 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:36 +0000 Received: from localhost ([127.0.0.1]:50711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwJ-0000h0-PR for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:36 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvk-0000ZR-GG for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:06 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yL0Sb; Thu, 30 Sep 2021 00:20:00 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:37 +0200 Message-Id: <20210929221938.17168-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632954000; bh=v8dpSt+yBNsMIXNs2uxccAIAWbz/Ch1xmzKzziL1T9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=s9ntng9iMEpfEUML5ij+zcfk5IVBk1uqG8rfc0oilNGiWGIQzyD58g1zE088d8sSv unB8SmgTVxOra1MIpMc+vMciJjNw3sbztx8kD3ohc4HD+HhX0EO/dQBhrRscEnfK1Y WUCWFiT5pp0rgXNrEqNXy2Lrl/fSEvr+N9VQzJU7jZqYwdxr+d9IVlwQDIGF689VTH Da666SolVjqS8GgcIdCOWum3Zxe9rN1kZru54hpVrQt652SDKmfhBOXIgp172h2Ak1 TBfhWnpf1qPvyQ7yWCGoi0QMf83AKOF9PDVFkaWl+UahQ8lgDwLQBE7SxJOhnhQJmu CL9Pqh+cf7HIg== 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 * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir))))))