From patchwork Sat Apr 17 17:06:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28611 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 2EC6627BC77; Sat, 17 Apr 2021 18:09:23 +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 B5C7727BC6C for ; Sat, 17 Apr 2021 18:09:22 +0100 (BST) Received: from localhost ([::1]:56476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRd-00013p-Sr for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0008Ex-0M for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0000De-8s 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-0005az-4L for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 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: 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.161867924121174 (code B ref 47661); Sat, 17 Apr 2021 17:08:04 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:21 +0000 Received: from localhost ([127.0.0.1]:44297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPg-0005VN-KL for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:20 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:62479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPd-0005V3-O2 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:18 -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 4FMzyq44CRz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyq44CRz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679235; bh=6nK2NM42HqEpH+kCqz23sS1FB9MrVUxwezoqXvygrLs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UPT3TfK1ht1HrGPETK3oUezf/hbwOlPup1Cbk7HK04ES2ZdBNaY3XugLN8i0RS13h ut5wjNKyJuZpwNt8sRb2zM3vV1i6TuVTnWg4+3HIvwOF2zXepnWZCpsaIqk8hTKCqN yjM+E482j8A3aGVhLBffqx9+ktvLIHjOsA1VZpUU= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:20 +0200 Message-Id: <20210417170648.3810-5-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-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 7548c26eab..9f96a22e09 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -503,7 +503,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 _