From patchwork Mon Jan 8 08:03:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58645 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 CA35327BBEE; Mon, 8 Jan 2024 08:06:47 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 2F7A227BBE2 for ; Mon, 8 Jan 2024 08:06:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdI-0003YD-VH; Mon, 08 Jan 2024 03:05:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMkdF-0003Tj-Ma for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMkdF-00032x-Dt for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdL-00085D-Db for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470109230624 (code B ref 68315); Mon, 08 Jan 2024 08:05:19 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:52 +0000 Received: from localhost ([127.0.0.1]:35001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcu-0007xl-6x for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:52 -0500 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:54693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcp-0007x7-Py for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:48 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.140.229]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 920802A097 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:40 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-qxqkr (unknown [10.111.182.85]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 402091FECC; Mon, 8 Jan 2024 08:04:40 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-qxqkr with ESMTPSA id t78ODZism2W4KgAA75Iixg (envelope-from ); Mon, 08 Jan 2024 08:04:40 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G0024da5be47-95d9-413e-820d-1d7c18cfb29f, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:07 +0100 Message-ID: <20240108080350.1665-35-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12436690372091372258 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/qt.scm (qt-build): Monadic procedure returns a gexp instead of a derivation. (qt-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I194a9d1a7c7600af2e991e1efad627a9ced235d1 --- guix/build-system/qt.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 978aed0fc1..27296a0f60 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -176,12 +177,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) ;;; @@ -263,12 +260,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:graft? #f ;consistent with 'gnu-build' - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define qt-build-system (build-system