From patchwork Sun May 22 05:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 39565 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 7B6E427BBEA; Sun, 22 May 2022 06:53:49 +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=0.4 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no 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 478C527BBE9 for ; Sun, 22 May 2022 06:53:49 +0100 (BST) Received: from localhost ([::1]:42608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nseXE-0007w1-Eh for patchwork@mira.cbaines.net; Sun, 22 May 2022 01:53:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nseWV-0007aM-Jt for guix-patches@gnu.org; Sun, 22 May 2022 01:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nseWU-0006qz-GF for guix-patches@gnu.org; Sun, 22 May 2022 01:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nseWU-0004eB-Ff for guix-patches@gnu.org; Sun, 22 May 2022 01:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55253] [PATCH 1/2] gnu: nginx-rtmp-module: Use #:configure-flags from nginx. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 May 2022 05:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55253@debbugs.gnu.org Received: via spool by 55253-submit@debbugs.gnu.org id=B55253.165319873417771 (code B ref 55253); Sun, 22 May 2022 05:53:02 +0000 Received: (at 55253) by debbugs.gnu.org; 22 May 2022 05:52:14 +0000 Received: from localhost ([127.0.0.1]:43495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nseVi-0004cZ-Ay for submit@debbugs.gnu.org; Sun, 22 May 2022 01:52:14 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:45158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nseVh-0004cM-J1 for 55253@debbugs.gnu.org; Sun, 22 May 2022 01:52:13 -0400 Received: from [2600:3c03::f03c:92ff:fe54:31cf] (helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nseVc-0002af-80 for 55253@debbugs.gnu.org; Sun, 22 May 2022 01:52:08 -0400 From: Jack Hill Date: Sun, 22 May 2022 01:51:56 -0400 Message-Id: <20220522055157.31807-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.36.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (nginx-rtmp-module)[arguments]: Simplify copying of arguments from nginx and augment #:configure-flags from nginx rather than overwriting. --- gnu/packages/web.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 600ef0c895..50401c07e1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -785,12 +785,9 @@ (define-public nginx-rtmp-module `(("nginx-sources" ,(package-source nginx)) ,@(package-inputs nginx))) (arguments - (substitute-keyword-arguments - `(#:make-flags '("modules") - #:modules ((guix build utils) - (guix build gnu-build-system)) - ,@(package-arguments nginx) - #:configure-flags '("--add-dynamic-module=.")) + (substitute-keyword-arguments (package-arguments nginx) + ((#:configure-flags flags) + #~(cons "--add-dynamic-module=." #$flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-nginx-sources From patchwork Sun May 22 05:51:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 39564 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 E003927BBEA; Sun, 22 May 2022 06:53:19 +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=0.4 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no 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 9E3AB27BBE9 for ; Sun, 22 May 2022 06:53:19 +0100 (BST) Received: from localhost ([::1]:42134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nseWk-0007bl-PC for patchwork@mira.cbaines.net; Sun, 22 May 2022 01:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nseWV-0007aN-Jh for guix-patches@gnu.org; Sun, 22 May 2022 01:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nseWU-0006r0-SO for guix-patches@gnu.org; Sun, 22 May 2022 01:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nseWU-0004eI-RW for guix-patches@gnu.org; Sun, 22 May 2022 01:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55253] [PATCH 2/2] gnu: nginx-rtmp-module: Use gexps in phases. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 May 2022 05:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55253@debbugs.gnu.org Received: via spool by 55253-submit@debbugs.gnu.org id=B55253.165319873717786 (code B ref 55253); Sun, 22 May 2022 05:53:02 +0000 Received: (at 55253) by debbugs.gnu.org; 22 May 2022 05:52:17 +0000 Received: from localhost ([127.0.0.1]:43497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nseVl-0004co-Hx for submit@debbugs.gnu.org; Sun, 22 May 2022 01:52:17 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:45156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nseVh-0004cL-J0 for 55253@debbugs.gnu.org; Sun, 22 May 2022 01:52:16 -0400 Received: from [2600:3c03::f03c:92ff:fe54:31cf] (helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nseVc-0002af-8r for 55253@debbugs.gnu.org; Sun, 22 May 2022 01:52:08 -0400 From: Jack Hill Date: Sun, 22 May 2022 01:51:57 -0400 Message-Id: <20220522055157.31807-2-jackhill@jackhill.us> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220522055157.31807-1-jackhill@jackhill.us> References: <20220522055157.31807-1-jackhill@jackhill.us> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (nginx-rtmp-module)[#:phases]: Use gexps and remove trailing #t. --- gnu/packages/web.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 50401c07e1..c93af29a93 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -791,24 +791,22 @@ (define-public nginx-rtmp-module ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) + (lambda _ (begin ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") - (invoke "tar" "xvf" (assoc-ref inputs "nginx-sources") + (invoke "tar" "xvf" #$(this-package-input "nginx-sources") ;; This package's LICENSE file would be ;; overwritten with the one from nginx when ;; unpacking the nginx source, so rename the nginx ;; one when unpacking. "--transform=s,/LICENSE$,/LICENSE.nginx," - "--strip-components=1") - #t))) + "--strip-components=1")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") + (lambda _ + (let ((modules-dir (string-append #$output "/etc/nginx/modules"))) - (install-file "objs/ngx_rtmp_module.so" modules-dir) - #t))) + (install-file "objs/ngx_rtmp_module.so" modules-dir)))) (delete 'fix-root-dirs) (delete 'install-man-page))))) (home-page "https://github.com/arut/nginx-rtmp-module")