From patchwork Sat Apr 17 17:06:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28628 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 E5EE127BC78; Sat, 17 Apr 2021 18:11:54 +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 1E5A727BC78 for ; Sat, 17 Apr 2021 18:11:51 +0100 (BST) Received: from localhost ([::1]:60240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU2-0002zU-9f for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoRK-0001Yh-Sw for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoRK-0000tD-LH for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoRK-0005h3-GM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 32/33] gnu: emacs-haskell-mode: 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:09: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.161867931321844 (code B ref 47661); Sat, 17 Apr 2021 17:09:02 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:33 +0000 Received: from localhost ([127.0.0.1]:44407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQc-0005fX-LM for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:33 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:52478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005d4-AH for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -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 4FMzzr0kxhz1LB1y for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzr0kxhz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679288; bh=PqzFaWxh0mtiyNpWxzsmN26tc2faQljCxhxpPubajkk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZluvTVYJH2poTYUiy6J4mbixbLEFZ5ksrtoSqfpOpjtBtobFD1xUSX0aOakm482o3 uL8VDrBq2F3uE91AYgMYEhqlZNgdnwTDy/d1VI+CKqugIg8Bz7fDPyV46o97zysvV9 JYTQWhLon9QnYBbBCdV+5LSkb/iukIjGb9p2dLrM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:47 +0200 Message-Id: <20210417170648.3810-32-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-haskell-mode)[#:phases]: Install to elpa-directory. --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90fe5b3a24..13d55af0e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1241,7 +1241,11 @@ replacement.") "/bin/emacs")) #:modules ((ice-9 match) (srfi srfi-26) + ((guix build emacs-build-system) #:prefix emacs:) ,@%gnu-build-system-modules) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -1282,7 +1286,7 @@ replacement.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (el-dir (string-append out "/share/emacs/site-lisp")) + (el-dir (emacs:elpa-directory out)) (doc (string-append out "/share/doc/haskell-mode-" ,version)) (info (string-append out "/share/info")))