From patchwork Sat Apr 17 17:06:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28627 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 CCA3527BC79; Sat, 17 Apr 2021 18:11:53 +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 0C4BC27BC77 for ; Sat, 17 Apr 2021 18:11:50 +0100 (BST) Received: from localhost ([::1]:60128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU1-0002wl-5t for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQf-00005n-ME for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQd-0000N3-Eh for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQb-0005fQ-9T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 29/33] gnu: emacs-dvc: 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:17 +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.161867929021662 (code B ref 47661); Sat, 17 Apr 2021 17:08:17 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:10 +0000 Received: from localhost ([127.0.0.1]:44384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005d6-0g for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:51709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005b5-Ie for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:05 -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 4FMzzk2rn2z1LB20 for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzk2rn2z1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679282; bh=+qPMVlRaLzsQTA7sJAm7PnvxLbhtc2GWbUlKlzVN7Ds=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UDJ9/0DysOpgddMAKj0sAU2UH4YY5QHQU0AUGHvqGosCzZlMapfvu/TGaeXdWEMqo xz8KH4MKsiCvOBLBQe0FMpBhP7KrNC/wApKIcs3G2fy4Z2J5LZ8sCbC9O38iw2/+if plpRE4Zzlq/ft0nryZdlzXFcXlEhpPYFM4Ll4H7A= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:44 +0200 Message-Id: <20210417170648.3810-29-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-dvc)[#:configure-flags]: Use elpa-directory for lispdir. --- gnu/packages/emacs-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 103d26e621..ee3df7cf19 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5243,9 +5243,15 @@ completion of relevant keywords.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-lispdir=" (assoc-ref %outputs "out") - "/share/emacs/site-lisp/")) + `(#: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")))) #:tests? #f ;no test suite #:phases (modify-phases %standard-phases