From patchwork Thu Apr 8 17:49:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28390 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 6F7BC27BC6D; Thu, 8 Apr 2021 18:52:08 +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 90FAF27BC71 for ; Thu, 8 Apr 2021 18:52:05 +0100 (BST) Received: from localhost ([::1]:35696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYp2-0005Y2-Nd for patchwork@mira.cbaines.net; Thu, 08 Apr 2021 13:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYoC-000540-1a for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo7-0004ME-UK for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo7-0003kG-UE for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 14/33] gnu: emacs-sly-stepper: 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:51:07 +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.161790426214279 (code B ref 47661); Thu, 08 Apr 2021 17:51:07 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:02 +0000 Received: from localhost ([127.0.0.1]:48199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo1-0003i0-N4 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:02 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:16639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnz-0003hf-OL for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:00 -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 4FGTMP2T79z1LWpZ for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMP2T79z1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904257; bh=9ZGM1Y4FMfojT4bt5dJm3L1PCdycNoxCYpCGukMKr3o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=L9apLV0CjgfpsU+dOYNiCmLsGjD+/OsHT7ASJxBz+Un0XmN4eSvcVK8b3PTc766ac 4gQ8xbtFw3Pfb9Evn++sRbhfmBMgdXGCpbBxmVBhubiMyEtRtW5gmgvkt0JAv5pnBq 6SC1yky8BUEBCPOBhwwUzpt56GuxYWTF71Otas+Y= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:48 +0200 Message-Id: <20210408175007.13360-14-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-sly-stepper)[#:phases]: : Rename to... : ... this. Use find-files to find contrib directory. : Find slynk-stepper.lisp in elpa-directory. --- gnu/packages/emacs-xyz.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 96df1ecadd..8615269546 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10333,24 +10333,26 @@ inside the source file.") (propagated-inputs `(("emacs-sly" ,emacs-sly))) (arguments - '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) + `(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) #:phases (modify-phases %standard-phases ;; The package provides autoloads. (delete 'make-autoloads) (delete 'enable-autoloads-compilation) - (add-after 'add-source-to-load-path 'add-contrib-to-emacs-load-path + (add-after 'expand-load-path 'expand-sly-contrib (lambda* (#:key inputs #:allow-other-keys) - (let ((sly (assoc-ref inputs "emacs-sly"))) + (let* ((sly (assoc-ref inputs "emacs-sly")) + (contrib (find-files sly "^contrib$" #:directories? #t))) (setenv "EMACSLOADPATH" - (string-append sly "/share/emacs/site-lisp/contrib:" - (getenv "EMACSLOADPATH")))) - #t)) + (string-append (string-join contrib ":") + ":" + (getenv "EMACSLOADPATH"))) + #t))) (add-after 'install 'find-agnostic-lizard (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/share/emacs/site-lisp/" - "slynk-stepper.lisp")) + (file (string-append (elpa-directory out) + "/slynk-stepper.lisp")) (asd (string-append (assoc-ref inputs "cl-agnostic-lizard") "/share/common-lisp/systems/agnostic-lizard.asd")))