From patchwork Thu Apr 8 17:49:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28402 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 EC95E27BC70; Thu, 8 Apr 2021 18:53:59 +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 64A2427BC6E for ; Thu, 8 Apr 2021 18:53:58 +0100 (BST) Received: from localhost ([::1]:39270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYqr-0007Rr-Ew for patchwork@mira.cbaines.net; Thu, 08 Apr 2021 13:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYp0-0005mF-UU for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYp0-0004vV-Km for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYp0-0003po-Jn for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:52:02 +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.161790426914444 (code B ref 47661); Thu, 08 Apr 2021 17:52:02 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:09 +0000 Received: from localhost ([127.0.0.1]:48224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo8-0003ka-ON for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:09 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo6-0003jX-7P for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:06 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMV6lmQz1DH6p for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMV6lmQz1DH6p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904263; bh=DVUaVP6A9csp5hcBh/4XLN54LGcUr+eAWC7sGfQJXvI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bWzt/CzVjVHZtA/EeVqopZLxtGiLIWxCk93R4FFdWePgi89i++lmqWQehDfS1BDtP r3tv6kyWizgvDjwXPNcSwZKBIgkKyzhJiL6IwElOUyrCA4sFLwiJEUCY580Zip1a/U O8drPkguM7YVpbVsYe0d9eJBFaq8wE42VzzyMrcE= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:51 +0200 Message-Id: <20210408175007.13360-17-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-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-edbi)[patch-path]: Execute after unpack. [wrap-edbi-bridge]: New phase (after wrap). Find edbi-bridge in elpa-directory. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be000dede3..f3d9f98189 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21419,17 +21419,21 @@ asynchronous communications, the RPC response is fairly good.") `(#:include '("\\.el$" "\\.pl$") #:phases (modify-phases %standard-phases - (add-after 'install 'patch-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl")) - (dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))) - (substitute* (string-append dir "/edbi.el") + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((perl (assoc-ref inputs "perl"))) + (substitute* "edbi.el" (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) - (chmod (string-append dir "/edbi-bridge.pl") #o555) - (wrap-program (string-append dir "/edbi-bridge.pl") - `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))) - #t)))))) + #t))) + (add-after 'wrap 'wrap-edbi-bridge + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bridge (string-append (elpa-directory out) + "/edbi-bridge.pl"))) + (chmod bridge #o555) + (wrap-program bridge + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) + #t))))) (synopsis "Database Interface for Emacs Lisp") (description "This program connects the database server through Perl's DBI, and provides DB-accessing API and the simple management UI.")