From patchwork Thu Apr 8 17:49:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28396 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 725A927BC6D; Thu, 8 Apr 2021 18:53:25 +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 062EA27BC6F for ; Thu, 8 Apr 2021 18:53:24 +0100 (BST) Received: from localhost ([::1]:37500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYqJ-0006SI-45 for patchwork@mira.cbaines.net; Thu, 08 Apr 2021 13:53:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYo7-000530-AG for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo4-0004Kl-2R for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo4-0003ix-1T for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:51:03 +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.161790424414127 (code B ref 47661); Thu, 08 Apr 2021 17:51:03 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:44 +0000 Received: from localhost ([127.0.0.1]:48172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnk-0003fi-3f for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:44 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYni-0003fS-9z for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:42 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM36f70z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM36f70z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904239; bh=1XkRQ+SOU/eb7OI02c52aKSoejTiPy0EQGY9HuS3QBk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fvp7U5A3gdndac1ZtCli58+1UpfuFFxJuJZdWYUJyZaiIvxSdX85LnrzmiXngrwCb 1sinIlICuDWoT0hIixmZ06gz4J5tgHq5Sf//3BSJOgkyBw+uosavazdAXELYqP4gVp yO5oddwbBcSceldfQeVw7K9ad4DgNzlv9/4lnaaY= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:39 +0200 Message-Id: <20210408175007.13360-5-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-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-libgit)[set-libgit--module-file]: Use elpa-directory for libgit--module-file path. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8e80ccbb56..b0d5e0189c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -501,7 +501,7 @@ on stdout instead of using a socket as the Emacsclient does.") (make-file-writable "libgit.el") (emacs-substitute-variables "libgit.el" ("libgit--module-file" - (string-append out "/share/emacs/site-lisp/libegit2.so"))) + (string-append (emacs:elpa-directory out) "/libegit2.so"))) #t))) (add-before 'install 'prepare-for-install (lambda _