From patchwork Sat Apr 17 17:06:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28615 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 9FE0627BC77; Sat, 17 Apr 2021 18:10:09 +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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 D6BF427BC78 for ; Sat, 17 Apr 2021 18:10:07 +0100 (BST) Received: from localhost ([::1]:57428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSN-0001r6-0T for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0008Ey-1T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0000EL-Sq for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005bD-Mk for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 06/33] gnu: emacs-guix: 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:04 +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.161867924321192 (code B ref 47661); Sat, 17 Apr 2021 17:08:04 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:23 +0000 Received: from localhost ([127.0.0.1]:44300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPi-0005Vh-VC for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:23 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPf-0005VB-HA for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:19 -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 4FMzys2XHsz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzys2XHsz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679237; bh=I5Qgh9AHc4l76s/4eXIs4YnT8vZnAjaryvBsBppWpgw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LMzdFrze87ueWuBaFZT2D9Qd4/ra+0mh86TILNRsuWp+laBQft4yjlbYi3il2jlel 5ZDYajOJgOxZv9XJLO/ptshGxXQdXr1nwpLz3kQ2ONjXhY4fDFbb9VWjxfINTwIWHd ug0WoUxgXIvrLVsLJjhNopUgJX6nJuK5LA0ov1hw= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:21 +0200 Message-Id: <20210417170648.3810-6-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-guix)[#:phases]: Add expand-load-path. [#:configure-flags]: Install to elpa-directory. --- gnu/packages/emacs-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9f96a22e09..f825436f5e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3034,6 +3034,23 @@ type, for example: packages, buffers, files, etc.") (base32 "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj")))) (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:configure-flags + (list (string-append "--with-lispdir=" + (emacs:elpa-directory (assoc-ref %outputs "out")))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'expand-load-path + (lambda _ + ((assoc-ref emacs:%standard-phases 'expand-load-path) + #:prepend-source? #f) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake)