From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id oKw0LuWsm2VfCAEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:05:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id sPLBJ+Wsm2WSKwAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:05:57 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701157; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=UDsr3du2p2T4uR+7UXreBN1iE56FI2veJUz4QS1gDpE=; b=ABhz/4DXTwHtvDsWEmdoXg5NZ18BpT6K4pm2vGZYOzSjH/48ZSXdzxQ6o0X/3Oj02ACsvw 0ARYj5z95Fel7gKm0VtsyRyfAsaJCBlM/9ElgY55/+AHj5KIXScl86DmR1a2UtIrtbOXEF UCTzQh3/eAQJtmZQq0ly5pFsEwPbXDAGbItiwE3dd+UBmD8NZZuzYaDnsx0e7DZHoulfsz DAD33PRiThwRxIXnrkzCsivF0kDEuNBbaXkNjtGQW2Elv+eVUUGSYzFkhPlv8dfvqP6IpU 4IFTVzn1y0YWHoL9+WS5YLCRChsw8CWIlpgLhXTOJJe1perecl72zHDiJYp7AA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701157; a=rsa-sha256; cv=none; b=MAPTCj7yy+Po7PsOGT4mlt6lJ7LXp0utcM7n0uYOQZgLnfxe3Mf0qhaviS54f0PlqHDUjG wrdV/pZbhRxpv6AD7mLWSXocUBF2W6UQ4YzPsmlspy7g3jXazx8FQ7C9zxnpOYMc6AwN4J X0P+nC8e18bykZCdwemu2uoOn97VwC2V172zRbPw+X1fZ2dIrMRP4RFApJ3Qn8aJYcR90H icYbwC9KVUZGdfeeESHBIXt4dZqOpg8UUbGq44+/EjzjR1Slc8/3p68S9ou0KSaIEyykiS ML3KygRiIOEVZz5xwoTlqAa1LJeGNj0uEXJSmFdZrn0+gNkLo1xyRk8E1MnxQA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 71AA145196 for ; Mon, 8 Jan 2024 09:05:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdC-0003P4-97; Mon, 08 Jan 2024 03:05:10 -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 1rMkd8-0003Lv-TF for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:06 -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 1rMkd8-0002zy-HE for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdE-00083F-I7 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 20/48] 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: Mon, 08 Jan 2024 08:05:12 +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.170470107430412 (code B ref 68315); Mon, 08 Jan 2024 08:05:12 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:34 +0000 Received: from localhost ([127.0.0.1]:34958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcb-0007uH-7j for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:33 -0500 Received: from 1.mo575.mail-out.ovh.net ([46.105.41.146]:41895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcU-0007sm-8b for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:27 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.17.89]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 1DD4927783 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:19 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zm744 (unknown [10.110.96.193]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B6EA81FE53; Mon, 8 Jan 2024 08:04:18 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-zm744 with ESMTPSA id /JUzMoKsm2UmjDAA2Lfe6g (envelope-from ); Mon, 08 Jan 2024 08:04:18 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:52 +0100 Message-ID: <20240108080350.1665-20-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12430497922373116642 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: 71AA145196 X-Migadu-Scanner: mx11.migadu.com X-TUID: UtCRbS/nzviZ * 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 90da8d28f0..696b9b1ea8 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. ;;; @@ -148,7 +149,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)) @@ -180,16 +181,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 @@ -274,15 +267,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 -- 2.41.0