From patchwork Mon Aug 16 14:12:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32127 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 1647827BC78; Mon, 16 Aug 2021 15:13:24 +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_H2,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 CA4BE27BC6B for ; Mon, 16 Aug 2021 15:13:23 +0100 (BST) Received: from localhost ([::1]:44974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFdMg-0005X5-RT for patchwork@mira.cbaines.net; Mon, 16 Aug 2021 10:13:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFdMN-0005Wg-44 for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFdMM-0002of-J0 for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFdMM-0004u3-ED for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH 1/3] gnu: notmuch: Add separate 'emacs' output. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Aug 2021 14:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50077@debbugs.gnu.org Cc: Nicolas Goaziou , Andrew Tropin Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.162912315418785 (code B ref 50077); Mon, 16 Aug 2021 14:13:02 +0000 Received: (at 50077) by debbugs.gnu.org; 16 Aug 2021 14:12:34 +0000 Received: from localhost ([127.0.0.1]:50672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFdLt-0004su-OJ for submit@debbugs.gnu.org; Mon, 16 Aug 2021 10:12:33 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:50454 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFdLr-0004sh-P9 for 50077@debbugs.gnu.org; Mon, 16 Aug 2021 10:12:32 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1629123144; bh=Mck8+RN4a+JI2cFzpcFLhiuQEqPibAeFOwLolNsngjg=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=JHSwRy5OU6ClkQb5GAJ8Ji8d9ib5fxaJhREvUKYnJiU2eEXx5Hip8nXb7dMH6CKqw j6ZEe4aiNTkUsUPMsRf7Fp6uog5soNnflEBzsWR3HDG6G85y3YYETt8nNmcY+7Q2f4 nu+vZRUngy8Ggd6NTRhKXD0l5WPRiHtbVjz5xPYY= In-Reply-To: References: Message-Id: Date: Mon, 16 Aug 2021 16:12:19 +0200 MIME-Version: 1.0 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/mail.scm (notmuch)[outputs]: Add ‘emacs’ output [arguments]<#:modules>: Add (guix build emacs-utils). <#:phases>{configure}: Use the ‘emacs’ output. {make-autoloads}: Modify the default ‘make-autoloads’ phase to use the ‘emacs’ output. --- gnu/packages/mail.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ccf44b7cf3..bbc616f6f5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1337,7 +1337,8 @@ invoking @command{notifymuch} from the post-new hook.") (arguments `(#:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils)) + (guix build utils) + (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules (guix build emacs-build-system) (guix build emacs-utils)) @@ -1355,7 +1356,8 @@ invoking @command{notifymuch} from the post-new hook.") (setenv "CONFIG_SHELL" (which "sh")) (let* ((out (assoc-ref outputs "out")) - (elisp (emacs:elpa-directory out))) + (emacs (assoc-ref outputs "emacs")) + (elisp (emacs:elpa-directory emacs))) (invoke "./configure" (string-append "--prefix=" out) (string-append "--emacslispdir=" elisp) @@ -1373,7 +1375,14 @@ invoking @command{notifymuch} from the post-new hook.") (substitute* (find-files "test" "\\.sh$") (("/bin/sh") (which "sh"))))) (add-after 'install 'make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")) + (out (assoc-ref outputs "emacs")) + (elpa-name-ver ((@@ (guix build emacs-build-system) + store-directory->elpa-name-version) out)) + (elpa-name (package-name->name+version elpa-name-ver)) + (el-dir (emacs:elpa-directory out))) + (emacs-generate-autoloads elpa-name el-dir))))))) (native-inputs `(("bash-completion" ,bash-completion) ("emacs" ,emacs-no-x) ; -minimal lacks libxml, needed for some tests @@ -1394,6 +1403,7 @@ invoking @command{notifymuch} from the post-new hook.") ("talloc" ,talloc) ("xapian" ,xapian) ("zlib" ,zlib))) + (outputs '("out" "emacs")) (home-page "https://notmuchmail.org/") (synopsis "Thread-based email index, search, and tagging") (description