From patchwork Fri May 27 02:04:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 39620 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 6037627BBEA; Fri, 27 May 2022 03:06:05 +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 36D8C27BBE9 for ; Fri, 27 May 2022 03:06:05 +0100 (BST) Received: from localhost ([::1]:45560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuPMa-0006BE-8H for patchwork@mira.cbaines.net; Thu, 26 May 2022 22:06:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuPLc-0006AS-Po for guix-patches@gnu.org; Thu, 26 May 2022 22:05:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuPLa-0008HO-Mk for guix-patches@gnu.org; Thu, 26 May 2022 22:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nuPLa-000545-Gz for guix-patches@gnu.org; Thu, 26 May 2022 22:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55253] [PATCH v2 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: Fri, 27 May 2022 02:05: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.165361706619410 (code B ref 55253); Fri, 27 May 2022 02:05:02 +0000 Received: (at 55253) by debbugs.gnu.org; 27 May 2022 02:04:26 +0000 Received: from localhost ([127.0.0.1]:60408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuPL0-000530-AM for submit@debbugs.gnu.org; Thu, 26 May 2022 22:04:26 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:38406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuPKv-00052j-18 for 55253@debbugs.gnu.org; Thu, 26 May 2022 22:04:24 -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 1nuPKp-0004xi-Uq for 55253@debbugs.gnu.org; Thu, 26 May 2022 22:04:15 -0400 From: Jack Hill Date: Thu, 26 May 2022 22:04:03 -0400 Message-Id: <20220527020404.6603-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, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ffcb709e82..e349a863d5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -793,11 +793,10 @@ (define-public nginx-rtmp-module ,@(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=.")) + `(#:make-flags '("modules") ;Only build this module not all of nginx. + ,@(package-arguments nginx)) + ((#:configure-flags flags) + #~(cons "--add-dynamic-module=." #$flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-nginx-sources