From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8P/REA4r3V/DJgAA0tVLHw (envelope-from ) for ; Fri, 18 Dec 2020 22:19:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OByQDA4r3V8PZQAAbx9fmQ (envelope-from ) for ; Fri, 18 Dec 2020 22:19:58 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DB64A9403A6 for ; Fri, 18 Dec 2020 22:19:57 +0000 (UTC) Received: from localhost ([::1]:53082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqO6O-00088x-P0 for larch@yhetil.org; Fri, 18 Dec 2020 17:19:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqO5X-0007Kx-La for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqO5X-000700-DK for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kqO5X-0000CL-8o for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45316: [PATCH 05/26] gnu: emacs-libgit: Adjust following emacs-build-system changes. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 18 Dec 2020 22:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45316 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 45316@debbugs.gnu.org Received: via spool by 45316-submit@debbugs.gnu.org id=B45316.1608329902441 (code B ref 45316); Fri, 18 Dec 2020 22:19:03 +0000 Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:22 +0000 Received: from localhost ([127.0.0.1]:40268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO4s-00006t-8c for submit@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:22 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:45316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO4p-00005G-8l for 45316@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:19 -0500 Received: by mail-qk1-f178.google.com with SMTP id b64so3563834qkc.12 for <45316@debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UfvP46zZXtJ+kYVT40QKckY8bM7RXIval+IY6BzArdM=; b=jRsfcniWWvLzGnwUCET4sETrhArkAjdhifx7LWSgXYO8D2GQrcpBkKUk6yFp6FhFMF OBx52P2NBr7tzbTlfoYFDXA2/6kru1UQ2ipy1L8/n6ReqMjsjrAnzTTL8dYIDTXyEtYf xJ3qg+1N5Ch/DHE+6PAlWV2yjfDN5ahOBpsR4UZG/WAQXp8B7y9k+5gSWuQCJ7wj0bWi xDL0hYfBPYrLhO0aikkQEF2bsjLgJhZgCleydCGATbFdtLI+9ZANqUESWsDvdbjRc12k wIRA0r4Vp01uPimvrxmX4mYi3kW9eb4vaTDraHCwUkDmd0wxhJSJSUzcPMoXZYlHoSFB DqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UfvP46zZXtJ+kYVT40QKckY8bM7RXIval+IY6BzArdM=; b=Zqhs/0LP23qJjont0SNvNTaIttYVlPu36BnBVLKXTdP7JcVaAuEIrLIgkQ144UBw2W /GEL6iC5J/GJICfRoVvlVvwTs8YSyFTTyVD9WIVsl+YX+eOEhBkwd1eYD2qJfokDD0vz k+RON1xW+KSjPEW0qLOWXSiBpwJWVxFX5Hs7FPia6prpgFmB/z218sAYpKK6Yh1kvrm6 AOBjqL8XZSWNwIMgJZOgIHnwN3aTuCR55jiJs15XhtkwpAdadczHcOC08t8IpEuF/UCS m9GpnAv/xMTNkwLswLwNp8Sr1/0t9qUeUHvdCcxf9e2KilKGnS4XJ3f21pZE00rAQF2J rFdA== X-Gm-Message-State: AOAM531xtijdoivqDvX2ocNGNs14xpcxIUxRuoDZJqPiJR1PpJ4jqWL9 5d4EJP0E2S22qy9l7fUx1psBkqQvcs6dpoTy X-Google-Smtp-Source: ABdhPJxQOX3y4s0BsFHQZtmv1LeYQZEvS15319dj32+IZ60MvlwbUgDm5b1kYikdldmay1/3J6MgOQ== X-Received: by 2002:a05:620a:1ea:: with SMTP id x10mr7054557qkn.90.1608329893787; Fri, 18 Dec 2020 14:18:13 -0800 (PST) Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235]) by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 14:18:13 -0800 (PST) From: Maxim Cournoyer Date: Fri, 18 Dec 2020 17:17:02 -0500 Message-Id: <20201218221723.26829-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@gmail.com> References: <20201218221723.26829-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=jRsfcniW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: DB64A9403A6 X-Spam-Score: 2.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: DmEec+Ex2SLt * gnu/packages/emacs-xyz.scm (emacs-libgit)[phases] {set-libgit--module-file}: Adjust the installation prefix. {create-pkg.el}: New phase. --- gnu/packages/emacs-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 01dab957aa..1a168075e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -457,7 +457,8 @@ 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:outputs->elpa-install-dir outputs) + "/libegit2.so"))) #t))) (add-before 'install 'prepare-for-install (lambda _ @@ -471,7 +472,9 @@ on stdout instead of using a socket as the Emacsclient does.") (install #:outputs outputs #:include (cons "\\.so$" emacs:%default-include))))) - (add-after 'install 'make-autoloads + (add-after 'install 'create-pkg.el + (assoc-ref emacs:%standard-phases 'create-pkg.el)) + (add-after 'create-pkg.el 'make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'make-autoloads 'enable-autoloads-compilation (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)) -- 2.29.2