Message ID | 20250209005219.25070-6-ngraves@ngraves.fr |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F44727BBEE; Sun, 9 Feb 2025 00:53:36 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 0B11127BBE9 for <patchwork@mira.cbaines.net>; Sun, 9 Feb 2025 00:53:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1tgvZS-00042i-AV; Sat, 08 Feb 2025 19:53:14 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tgvZO-00040r-Kf for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:11 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tgvZN-0007mb-Bm for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:10 -0500 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=VUezH1lkixs+Lfnizfmvkg4gEId3qCn0DmwwZxtOKNw=; b=ct6s0UmMPHoyXXWPwD73i6cChRHCg1QIAKMnEggfRJyiDVTXmjGGEbmCcHrCB3eGJ0HXI5lHDSkWhtrEsrljVbo4q2uf+2SmYbFn836Ui3oiBzd7n5AEiuJKjmaFEgvGQQDQZy3CrkHLmVfhtVP85PmPu6cSlMSplAymSUd1xqGDKzyoiq1GLlqoeFq9HYjnLHwlELeu8UP/Oi0UomB4CXXWHGO1DP0Fs07mbiT4dpYf77dAg5fi3CSQMe0aKJ8koJs9bMcNu4AsbzY2VyUoD6kOfSHc8xByV1paD/VTDBBqBgk4qkvg5sJj8g9NhWbOvj2D6naaymlG9vjLXTSiQQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tgvZN-0007DO-4b for guix-patches@gnu.org; Sat, 08 Feb 2025 19:53:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH v3 05/47] build-system: android-ndk: Redefine gnu-build. Resent-From: Nicolas Graves <ngraves@ngraves.fr> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 00:53:09 +0000 Resent-Message-ID: <handler.68315.B68315.173906235827281@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 68315@debbugs.gnu.org Cc: Nicolas Graves <ngraves@ngraves.fr> Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.173906235827281 (code B ref 68315); Sun, 09 Feb 2025 00:53:09 +0000 Received: (at 68315) by debbugs.gnu.org; 9 Feb 2025 00:52:38 +0000 Received: from localhost ([127.0.0.1]:41982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tgvYr-00075t-M2 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:38 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:32843) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ngraves@ngraves.fr>) id 1tgvYi-000747-LT for 68315@debbugs.gnu.org; Sat, 08 Feb 2025 19:52:29 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.137]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yr8Lg5G1wz1chF for <68315@debbugs.gnu.org>; Sun, 9 Feb 2025 00:52:27 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-vplvf (unknown [10.108.54.10]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 829E51FD80; Sun, 9 Feb 2025 00:52:27 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-vplvf with ESMTPSA id DswLDkv8p2ePHwAAp69fzg (envelope-from <ngraves@ngraves.fr>); Sun, 09 Feb 2025 00:52:27 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002669f2aed-4574-4c9d-a1b3-28d8a6c2ad29, 5680413659C5D3F0AB4AC1D1E09FAEA3C919EDB8) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Feb 2025 01:50:45 +0100 Message-ID: <20250209005219.25070-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209005219.25070-1-ngraves@ngraves.fr> References: <20250209005219.25070-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 18179624322683757282 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeffeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdelleegfeefteelkeeugedvhfetvdeuffeihfektdeljeekudevlefgudefudelnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=VUezH1lkixs+Lfnizfmvkg4gEId3qCn0DmwwZxtOKNw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739062347; v=1; b=a6d2iObL1Z+Hflw6D7KqACebdLctBPb3HxIMvNJDHig6f0DeFuPdHdniQNgnJ60XHUohZr3C KhE/HJMIWNj2FvspiZT4UexdoZg/gQEvM/eS5hcx25rfyBPOd+rIJpUIolT3BuPlxTKZo6d/KQA lA5/Jv3fwqUrH+fJwmOwecJ7VuZTX0Hq1DJsM2r8Z0nVfH7IKf4WnX/D15JwlHvi3160IA6RV7Q J330OQwZBPKaD1X0FgpEE6Al1f/NZcZ37b20bwqRYXw6bLHi5qaLzXc8+5y4N9E4oaq8/2B1bpy 1UHbuW+Wt2+pemFVf9DPQb4kL++BnedadWhJtIJA+u+Ww== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Nicolas Graves <ngraves@ngraves.fr> X-ACL-Warn: , Nicolas Graves via Guix-patches <guix-patches@gnu.org> From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org> 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 |
Series |
Extend bag-build to gexp.
|
|
Commit Message
Nicolas Graves
Feb. 9, 2025, 12:50 a.m. UTC
* guix/build-system/android-ndk.scm (android-ndk-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: If1737d77ebccd418ad461c91aff170273855ed45 --- guix/build-system/android-ndk.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index b8cd56b871..66cd96c725 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,11 +74,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (lower name #:key source inputs native-inputs outputs system target