From patchwork Sat Apr 17 17:06:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28608 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 E84D627BC79; Sat, 17 Apr 2021 18:08:43 +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 798D927BC6C for ; Sat, 17 Apr 2021 18:08:42 +0100 (BST) Received: from localhost ([::1]:55694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQz-0000Zg-L1 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0008H9-KV for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQW-0000In-El for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQW-0005e1-9g for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 18/33] gnu: emacs-scel: 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:12 +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.161867927021386 (code B ref 47661); Sat, 17 Apr 2021 17:08:12 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:50 +0000 Received: from localhost ([127.0.0.1]:44338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ9-0005Yn-Ti for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:50 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:54087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ2-0005Y0-JI for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:42 -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 4FMzzJ279Mz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzJ279Mz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679260; bh=tRbrmcfY7kpXCqmYMZ26440r/LlYyxEzyeapEwZM0eo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=e0qcHQcU1iBlffWk56agi0i/s7EdB79rj+UJLRIPSejF2UAZEnnYWdKCe5xtW+anW E+Wtq64Gr7+qUgE45YD6Y4Z1e85BhW7LH+/ZJqJqSmMo74G5FSepR69DWe+l0yARwJ rKN74eBqOvcgYluisSNVAxmvbHpDJYsOf1xrHA3s= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:33 +0200 Message-Id: <20210417170648.3810-18-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-scel)[#:phases]: Use elpa-directory. : Adjust location. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 00a3368620..90031faf15 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6138,12 +6138,11 @@ to a key in your preferred mode.") (lambda* (#:key outputs #:allow-other-keys) (substitute* "el/CMakeLists.txt" (("share/emacs/site-lisp/SuperCollider") - (string-append - "share/emacs/site-lisp"))) + (elpa-directory (assoc-ref outputs "out")))) ((assoc-ref cmake:%standard-phases 'configure) #:outputs outputs #:configure-flags '("-DSC_EL_BYTECOMPILE=OFF")))) - (add-after 'add-source-to-load-path 'add-el-dir-to-emacs-load-path + (add-after 'expand-load-path 'add-el-dir-to-emacs-load-path (lambda _ (setenv "EMACSLOADPATH" (string-append (getcwd) "/el:" (getenv "EMACSLOADPATH")))