From patchwork Mon Feb 19 21:44:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Zancanaro X-Patchwork-Id: 60795 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 2FA8727BBEA; Mon, 19 Feb 2024 21:48:02 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 80C4627BBE2 for ; Mon, 19 Feb 2024 21:48:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcBUH-0003b0-0n; Mon, 19 Feb 2024 16:47:45 -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 1rcBUD-0003Zb-Pk for guix-patches@gnu.org; Mon, 19 Feb 2024 16:47:41 -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 1rcBUD-00083c-Hc for guix-patches@gnu.org; Mon, 19 Feb 2024 16:47:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcBUY-0005qq-PR for guix-patches@gnu.org; Mon, 19 Feb 2024 16:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69272] [PATCH v2 2/4] gnu: Use copy-build-system for prosody modules. Resent-From: Carlo Zancanaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Feb 2024 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69272 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69272@debbugs.gnu.org Received: via spool by 69272-submit@debbugs.gnu.org id=B69272.170837924522423 (code B ref 69272); Mon, 19 Feb 2024 21:48:02 +0000 Received: (at 69272) by debbugs.gnu.org; 19 Feb 2024 21:47:25 +0000 Received: from localhost ([127.0.0.1]:43696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTw-0005pV-Aa for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:24 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBTt-0005og-FJ for 69272@debbugs.gnu.org; Mon, 19 Feb 2024 16:47:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=EJDjrg7TbDYwCqo fXc6YFFo3NvkEcv4hxLwA9iUWZO4=; h=references:in-reply-to:date:subject: to:from; d=zancanaro.id.au; b=N4vpEoP5kKU8MPhCS07GcdTxrCtLC9p4tt6VxPIw bSQThsluvgRNrNcYvt3EUY8/kIu2SxGzBe5KxKWsF2XVEWN9mHVY3NIN7vQHqF2mX0OilL bdHvG+gD2anMHZTNgy/gvvjmFuYhXibWYWRD3++pc1RkjRki/KPtgA2+GVvdM= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id a5a937e7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <69272@debbugs.gnu.org>; Mon, 19 Feb 2024 21:46:44 +0000 (UTC) From: Carlo Zancanaro Date: Tue, 20 Feb 2024 08:44:17 +1100 Message-ID: <6bf5ba79c63dc0e6e5cc46e5a89f020aa8a790e3.1708379059.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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 * gnu/packages/messaging.scm (prosody-module): Use copy-build system. Change-Id: I6de2827c63cb454d80b20f3af84fa610a75172f4 --- The only change from v1 is to remove the home-page definition from this diff (because it's now in the earlier patch). gnu/packages/messaging.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d06cd74177..3dd1e66e81 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,6 +144,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -1600,17 +1601,9 @@ (define (prosody-module module-name) (sha256 (base32 "142wrcism70nf8ffahhd961cqg2pi1h7ic8adfs3zwh0j3pnf41f")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source"))) - (with-directory-excursion (in-vicinity source module-name) - (install-file (string-append module-name ".lua") out)) - #t)))) + `(#:install-plan '((,(string-append module-name "/") ".")))) (home-page (string-append "https://modules.prosody.im/" module-name ".html")) (synopsis #f)