From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wDSKOtHPiWJOsQAAbAwnHQ (envelope-from ) for ; Sun, 22 May 2022 07:53:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UN1qOtHPiWIt0wAAauVa8A (envelope-from ) for ; Sun, 22 May 2022 07:53:21 +0200 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 826B07891 for ; Sun, 22 May 2022 07:53:21 +0200 (CEST) Received: from localhost ([::1]:42134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nseWm-0007bl-5z for larch@yhetil.org; Sun, 22 May 2022 01:53:20 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653198801; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=ucYMljFFQxXTONAgO6sZ4a1/vaFKkAfmtNrYKn/sAFw=; b=VHJzv6vsApOY9kqnzHJqOaW1B959nYugsxhSvlTcDw83hD992UhHwBaZTLA3jRy/u1TjrW QSD04OhbD908CZvBhHnmGWBLa+7rSbDkfQe24Oe5PGx3JaAEEQM5x0tz7RXfCwXKNk79dJ aXT6GUBM4j+bsQ7fTFDguyQ9fuR2UjRNpnnjbiglq0/lmamdei+tYoU9a+fp6qLsiLnrPC 2QLAUWf8BDqL41GzcZoFYQ98faonTtcxl/BPbpAvYgkUuIZ+qHF9hX22HptUlxJm/QBFN3 /RSK5OqydIy9RTHV6Y/mu82LCK/w9PXi39znmDh5VdpAUPkIhls+y1sJCBYJoA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653198801; a=rsa-sha256; cv=none; b=t14QalkBVppDAc7n97BJnwRmn/v2FI4WDF8eD9Cd2+JZlvpJ4115CRf9TzWWc1PDB5HGvD lOoNlh+yjzhacfc6CbUkqPDApEvzQV/nzXJhgT9R62PcNlQswMGo/0qVpPWk5cNLLt+45v bxmMtptft2+cD9rsDPWxHHSqyvsmHN+A+mxvH0TzftKahFQBvYf89WtIsXoaqoljVnEo6K cQqEHqtF5Fjns/0U0anSz6dFZ3+x1a6AAsITqxLp0JpOq4WZms/mdfHN8DbwyDMmcUWZGS bydGw2++UiOYxI6dKM6vQRpH7uyZ4lvrKVLacBbxfmTOR1sy12JHmt6uEScN4g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Spam-Score: 1.75 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Queue-Id: 826B07891 X-Spam-Score: 1.75 X-Migadu-Scanner: scn0.migadu.com X-TUID: BczFpnWF7MRI * 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") -- 2.36.1