From patchwork Sat Jun 5 11:49:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 29941 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 7D55427BC78; Sat, 5 Jun 2021 15:04:18 +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_H4,RCVD_IN_MSPIKE_WL, 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 D3B6127BC81 for ; Sat, 5 Jun 2021 15:04:16 +0100 (BST) Received: from localhost ([::1]:52088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpWuN-00055g-VT for patchwork@mira.cbaines.net; Sat, 05 Jun 2021 10:04:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpWuC-00055I-GE for guix-patches@gnu.org; Sat, 05 Jun 2021 10:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpWuA-0005O4-DC for guix-patches@gnu.org; Sat, 05 Jun 2021 10:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lpWuA-00057q-0o for guix-patches@gnu.org; Sat, 05 Jun 2021 10:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48849] [PATCH core-updates]: Add #:sh argument to wrap-qt-program Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Jun 2021 14:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48849@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162290179019640 (code B ref -1); Sat, 05 Jun 2021 14:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2021 14:03:10 +0000 Received: from localhost ([127.0.0.1]:49850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtJ-00056i-LL for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtF-00056X-3M for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpWtE-00052I-JR for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from albert.telenet-ops.be ([2a02:1800:110:4::f00:1a]:45554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpWtB-0004n3-9T for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from butterfly ([188.188.221.10]) by albert.telenet-ops.be with bizsmtp id DS2r2500A0E3zys06S2w6U; Sat, 05 Jun 2021 16:02:56 +0200 Message-ID: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> From: Maxime Devos Date: Sat, 05 Jun 2021 13:49:23 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1622901776; bh=L5RylUGQEcdIrtOFrl+yuvTjDtJuEISbKdVONo3BNwM=; h=Subject:From:To:Date; b=UMcECXEs9W07a25T4VWVC4jvp4G9ne2d1LQGhuB7HO2dO7iPXJ8rD9phw5JJ/5+AR XU/hwptur9VT+NYH2he+C5U5obyyUvyAg9c0O19MTRBJUR2o4WLOPLLY4aor1DAMSb ph4zuEm0cOb0xu8aGDqsC5NTtlzkjSh3x6h3P32Hatbk+yipx1H3OKpbPlmahwnbIn UJ1utt8nCgxJKFjABL5NenLmQWHMF0bHLMmPAENbi9mkuASJPhTa4NBEoeFeMeDgni dAB7Yche6Wa7LlHG4isXvdAAtUqe6e1i9VuMIF4QLqAgtbtpdOhYNBwUsw1q9AFH7C PMHyiE60ZagqA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:1a; envelope-from=maximedevos@telenet.be; helo=albert.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi guix, This patch series adds a #:sh keyword argument to wrap-qt-program and adjusts callers to set this keyword argument appropriately. Setting this argument appropriately is required for cross-compilation. Otherwise, a bash for SYSTEM (as in --system=..) is used instead of a bash for TARGET (as in --target=...). I didn't test building some qt programs with this patch series yet, as I'm currently waiting on the substitute servers to catch up with recent changed to core-updates (to avoid building a tower of rusts). I'll do that later. Greetings, Maxime From 92803cbef5affa3dbbf049262e1fcf290d8d8622 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sat, 5 Jun 2021 11:04:21 +0200 Subject: [PATCH 8/8] gnu: kristall: Set #:sh argument of 'wrap-qt-program'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web-browsers.scm (kristall)[arguments]<#:phases>{wrap-program}: Set #:sh argument of ‘wrap-qt-program’. --- gnu/packages/web-browsers.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index af178f9092..3633ff34a8 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -443,9 +443,10 @@ access.") "/share/fonts/truetype/NotoColorEmoji"))) #t)) (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "kristall")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (search-input-file inputs "bin/bash"))) + (wrap-qt-program out "kristall" #:sh bash)) #t))))) (native-inputs `(("breeze-stylesheet" -- 2.31.1