From patchwork Sat Apr 17 17:06:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28629 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 E43F027BC78; Sat, 17 Apr 2021 18:11:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4101B27BC6C for ; Sat, 17 Apr 2021 18:11:52 +0100 (BST) Received: from localhost ([::1]:60402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU3-00033W-EL for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQg-00006H-Ha for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQe-0000OH-9b for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQc-0005fe-4T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 31/33] gnu: emacs-wget: Port to emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867929121690 (code B ref 47661); Sat, 17 Apr 2021 17:08:18 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:11 +0000 Received: from localhost ([127.0.0.1]:44390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005dV-VD for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQS-0005cX-Ft for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzp04ZJz1LB20 for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzp04ZJz1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679286; bh=Q1UhrOdMk4Jp+YIo+fj5+fK/SM1QxuTXzwcHEmbmjcI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=noSGWEbrTaXhrnn9ZYH9ybFGaTJVWayT0bXqc+Qil8Znx21JrJDVLk9MpQ0x3iF/M nQwXfC9Inh5mqs+wmD/OQz094HUMwRLaTLRr2fSCwuXFjP9FNLyw8nxyl763EwIrHd Vq50juKkK8BOsg/KRHtrpLMP3FNHbRo9TX6UEFZc= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:46 +0200 Message-Id: <20210417170648.3810-31-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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/emacs-xyz.scm (emacs-wget)[build-system]: Use emacs-build-system. [arguments]: Drop #:modules and #:imported-modules. Adjust #:phases accordingly. --- gnu/packages/emacs-xyz.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 949659e617..90fe5b3a24 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1795,35 +1795,18 @@ or unexpected behavior inside an elisp configuration file (typically version ".orig.tar.gz")) (sha256 (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff")))) - (build-system gnu-build-system) + (build-system emacs-build-system) (inputs `(("wget" ,wget))) (native-inputs `(("emacs" ,emacs-minimal))) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:tests? #f ; no check target + `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local") (assoc-ref outputs "out")) - (("/site-lisp/emacs-wget") "/site-lisp")) - #t)) - (add-before 'build 'patch-exec-paths + (add-after 'unpack 'patch-exec-paths (lambda* (#:key inputs outputs #:allow-other-keys) (let ((wget (assoc-ref inputs "wget"))) (emacs-substitute-variables "wget.el" ("wget-command" (string-append wget "/bin/wget")))) - #t)) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "wget" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/")) #t))))) (home-page "https://www.emacswiki.org/emacs/EmacsWget") (synopsis "Simple file downloader for Emacs based on wget")