From patchwork Sat Apr 17 17:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28618 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 5375927BC78; Sat, 17 Apr 2021 18:10:22 +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 E054727BC77 for ; Sat, 17 Apr 2021 18:10:21 +0100 (BST) Received: from localhost ([::1]:58344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSb-0002D6-1Z for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0008G0-MR for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0000H9-Sg for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQT-0005cx-Lp for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 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: Sat, 17 Apr 2021 17:08:09 +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.161867925921317 (code B ref 47661); Sat, 17 Apr 2021 17:08:09 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:39 +0000 Received: from localhost ([127.0.0.1]:44325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPz-0005Xe-4r for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:64488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPu-0005XG-GI for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:34 -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 4FMzz822KBz1LBSW for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz822KBz1LBSW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679252; bh=UVCK6qSd33NJjYPt04dMAZlqBN+Xk/kwYMqFxqrLJvs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MJbCtdnfu4KQpZFZxVDee6zwbyKU69FJ63yToC1QxBpOM0XYPAW6muIPkolpPb8zV 5crGfI3SsWDbjjvWRU1mMWHdXa3+H2ZD7bc1RsJ/ZmkmZkObYyG3TZo02GW2c0PCKq aWTnvj1X5DaZTEacPCaNQjXOQoHVELKxPK8j571A= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:29 +0200 Message-Id: <20210417170648.3810-14-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-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 ed22832fcb..9ffae08600 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10408,24 +10408,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")))