From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id UKFkE+usm2X+DAAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:03 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gJVlDOusm2WlfgEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:03 +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=1704701162; 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=ggILhTjfjXdExRhh8fqVbaWZAnW8crOafAJW1fB6PYc=; b=PV/p3krbBRh7en6gBDLYlkbKMIQCBlCpEpwhmyaaaxAJ/WyHZJ5+xfuZFPVCGX0UyKWMol y4bSBX5yGBqROB9bx2qfQIqPz8gwok6cq8P9BS1l/0W9UDmLx0EtOAmnMQP6mmztsf59gL WUlM9AnpjN+F0OONenyohA4qd+OUxYUr4wUogyVPtFNYbGew+Bud5PEINKW3wSWI2vqo1X mD0yp7+EddMCeZtx7VLXIToRBUs9Eyq63dNQRNiTCUkKFPXQUqeMhLg2bDFuJFbRluzHjX smcwkeZNmRfqsy1Q1MOewpfexHzTjDd7/g08my06uvm3js4hBIkMEMFZUoEKGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701162; a=rsa-sha256; cv=none; b=jE7e5ASKILurfkwvfJt11sAHWJthF2EqKwqpa6JeQiE+4airtTro4buBmqdzT0zu7tGegu 9gXxMCywpbr455uUMS6u23R0gczPSiWp02Te1zM7eJRX1FX1QpHl+F7VmYucaLGg+uyCLQ qNFhRRL/5AwmVCrWJsu/7/ZU4aLjbpkTda9GCscvJrLyRAoAsTY6InBlIFCXwVOer33w0k lQC9NfgXZ2HKNnUDnZ5IOtAIGgxI7iZf+VZAplC5xd31cjbrPCaASVxUKa3Gqwjr4mtIP7 ayVeHl3i9zcmL32E6eFlDYajSSkqFdMOc+xvocOH59O0pmoVMM040+kDr4LNzw== 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 D272D17B8C for ; Mon, 8 Jan 2024 09:06:02 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd2-0003GR-0Z; Mon, 08 Jan 2024 03:05:00 -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 1rMkd0-0003FO-VX for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:58 -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 1rMkd0-0002mM-MV for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkd6-00080d-MO for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:04 +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.170470105530188 (code B ref 68315); Mon, 08 Jan 2024 08:05:04 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:15 +0000 Received: from localhost ([127.0.0.1]:34914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcI-0007qk-Hp for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500 Received: from 16.mo583.mail-out.ovh.net ([87.98.174.144]:57301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcE-0007pZ-Pt for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:11 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.16]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id A6A4D24AA5 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:01 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-85jpc (unknown [10.110.113.129]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4D4BF1FEB3; Mon, 8 Jan 2024 08:04:01 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-85jpc with ESMTPSA id mbreEnGsm2UR5wEAwvW9MQ (envelope-from ); Mon, 08 Jan 2024 08:04:01 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:37 +0100 Message-ID: <20240108080350.1665-5-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: 12425712848502973154 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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.81 X-Spam-Score: -6.81 X-Migadu-Queue-Id: D272D17B8C X-Migadu-Scanner: mx12.migadu.com X-TUID: wKCn8HoQ7MMh * 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 aa7cc06279..cee5d6674d 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 ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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 -- 2.41.0