From patchwork Tue Aug 12 09:04:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43367 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 11D3227BC4B; Tue, 12 Aug 2025 10:07:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 9F2F127BC49 for ; Tue, 12 Aug 2025 10:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky0-0007Ax-OQ; Tue, 12 Aug 2025 05:06:48 -0400 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 1ulkxS-0006oW-5h for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:14 -0400 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 1ulkxR-0001JF-Qe for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fs+sZ7fLBPMBLjzfD6YdfJolqU3rmXtTjtNF0fsAKe8=; b=f/3VkDKsYQJ3D49ALtRBZGwyo8DUXbb8P3PG0k+EfI10+Vv/PLlII7oaec4uh5UJT9Z05r8R8KjeHr/hsnHxPoDZSKKlz7un9NGnxZn0AK7xigliR46p0yioam9OHIkVxWAbzgraLlHlGQf8Gdu0CV+rv7V86P06w+DONCrduAJo4YMMOmXq7X353DcQsuDRXAFuYmYgzLxs48BhEBcIZFHlNHGxDApXK9c8LDT+EjnWMpyGldAg0cFA0SkuzopyzeeOaCzVi+Fths63lJoxbkEECogZa18G1lVOwrHZwRJj7+Sj2Vc1BfswTnH1Htgxa4dz+XdiFpIjuuk5pkZkBA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxR-0007iL-AK for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 18/43] build-system: glib-or-gtk: Redefine glib-or-gtk-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79224@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498955729371 (code B ref 79224); Tue, 12 Aug 2025 09:06:13 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:57 +0000 Received: from localhost ([127.0.0.1]:51824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxB-0007dY-2f for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:57 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:55153) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwo-0007aw-9H for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:34 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZj1hwlz5wwm; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.13]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZj0W0Cz1xxB; Tue, 12 Aug 2025 09:05:33 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9414A94325D; Tue, 12 Aug 2025 09:05:32 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003a948ab61-5cc2-4e89-8837-05c30b204e6b, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:26 +0200 Message-ID: <20250812090457.19016-18-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812090457.19016-1-ngraves@ngraves.fr> References: <20250812090457.19016-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 278378756042253026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=fs+sZ7fLBPMBLjzfD6YdfJolqU3rmXtTjtNF0fsAKe8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989533; v=1; b=Um2HNxIov4qpMfdSE9d3zoMoKHSPIFeHzb1bKqM5R2WbP2Ao9+wWFx9K0tqbjXuXIWcDUNgJ 1ytYMb5k1aB6aQh88Ji+BY2kDIZgC5cuRoIg+H/mGMgukRIatMGhQEbau3wsCWUA9KPx2egVq8C C0dBMWzvTKGWeN+uuA/HdcH6/JJW2ptfHqBvXt2b6wjXI/M0bD2bs6P5YRCiRKPwg3CGjh1xwOs /2UC8nV5wtQS4IOfbKp8PwRw9qMey+qT8XluQOXjU/UNJipUTjRBoEoPQdK5wkKlB50o43CrpAl LdtRAVeeeS8VyIY2vdfC1W4JneQaQ62jfhTESP56kGcrA== 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/glib-or-gtk.scm (glib-or-gtk-build): Monadic procedure returns a gexp instead of a derivation. (glib-or-gtk-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I24f722e47f3ecce7132a7647b5689f6c10abbfd6 --- guix/build-system/glib-or-gtk.scm | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index c912adab4aa..1320bb5c052 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,7 +150,7 @@ (define* (glib-or-gtk-build name inputs allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -181,16 +182,8 @@ (define build #:strip-directories #$strip-directories))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (glib-or-gtk-cross-build name #:key @@ -275,15 +268,8 @@ (define %outputs #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define glib-or-gtk-build-system (build-system