From patchwork Mon Dec 2 21:34:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 16347 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 87185177FF; Mon, 2 Dec 2019 21:35:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2BE3B177ED for ; Mon, 2 Dec 2019 21:35:11 +0000 (GMT) Received: from localhost ([::1]:44800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLa-0003HG-LB for patchwork@mira.cbaines.net; Mon, 02 Dec 2019 16:35:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41073) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLU-0003Gt-AL for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibtLS-0005nk-Ay for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibtLR-0005n7-Qi for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibtLR-00018Z-O7 for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 1/2] gnu: emacs-telega: Use test suites. References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2019 21:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.15753224884334 (code B ref 38463); Mon, 02 Dec 2019 21:35:01 +0000 Received: (at 38463) by debbugs.gnu.org; 2 Dec 2019 21:34:48 +0000 Received: from localhost ([127.0.0.1]:39056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLD-00017p-TG for submit@debbugs.gnu.org; Mon, 02 Dec 2019 16:34:48 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLC-00017c-B9 for 38463@debbugs.gnu.org; Mon, 02 Dec 2019 16:34:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 64D862400FB for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575322480; bh=2Kznb2MfaMHzkYxvZPx8Zt6RizMTgwPG1KP11Ib1fj4=; h=From:To:Subject:Date:From; b=FeTP6ozFXwij1uFkK2Z+dW1y9wS7VqBeRVLACQzq7ENGkpVues3CpQHomE6LiQEun u1Kdn1ppVK6JQSeoXLRr9axcG+Dc4Woz0S5bFd5wVQbEH0JXMqHF7Peta+D7iFl0C3 MxPgrRh9hDVOPTN/YByGnHYQefEEI/rFXWFgBWh+DZj+xSqhDXLqwewrpWu5xqz6Gj F19bRHYwEl6paVjoFggVz1//blAd3ujj6LubqmQ19QwVAG6IUbJ+kYabVagAxaY/0Y +OynpaTg0e00nTY8hDpaFBjgWLuHpQ0Zo5/4ddPdoURRVHGEzQ1RoZ6BX4KVGvS8fy gsdOEjsIhrZww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47Rdg20nMpz9rxB for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:37 +0100 (CET) From: Brett Gilio Date: Mon, 02 Dec 2019 15:34:48 -0600 Message-ID: <87mucah0nb.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From 03a2617b29c92dc83828495305d73ec4074a5102 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 2 Dec 2019 15:26:27 -0600 Subject: [PATCH 1/2] gnu: emacs-telega: Use test suites. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Adds support for running the ert and server test suites. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8efa4a17c8..ad78209ebb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19974,7 +19974,7 @@ fish-completion. It can be used in both Eshell and M-x shell.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f + `(#:test-target "test" #:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) @@ -19984,17 +19984,45 @@ fish-completion. It can be used in both Eshell and M-x shell.") (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-patch + (add-after 'unpack 'prefix-patch (lambda _ (substitute* "server/Makefile" (("CC=cc") "CC=gcc") (("INSTALL_PREFIX=\\$\\(HOME\\)/.telega") (string-append "INSTALL_PREFIX=" (assoc-ref %outputs "out") - "/bin"))) + "/bin")) + ;; Manually invoke `run_tests.py` after install phase. + (("python3 run_tests.py") + "")) + #t)) + ;; The telega test suite checks for a version of Emacs + ;; compiled with imagemagick and svg support. Since we + ;; are using `emacs-minimal`, this step will fail. + ;; Grok the failing test, and remove problematic assertions. + (add-after 'unpack 'ert-suite-patch + (lambda _ + (substitute* "telega-core.el" + (("\\(image-type-available-p 'imagemagick\\) nil") + "t") + (("\\(image-type-available-p 'svg\\) nil") + "t")) + #t)) + ;; The server test suite has a hardcoded path. + ;; Reset this behavior to use the proper path. + (add-after 'unpack 'server-suite-patch + (lambda _ + (substitute* "server/run_tests.py" + (("~/.telega/telega-server") + (string-append (assoc-ref %outputs "out") + "/bin/telega-server"))) + #t)) + (add-after 'install 'run-server-suite + (lambda _ + (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - + ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) @@ -20008,7 +20036,8 @@ fish-completion. It can be used in both Eshell and M-x shell.") `(("emacs-visual-fill-column" ,emacs-visual-fill-column))) (native-inputs `(("tdlib" ,tdlib) - ("emacs" ,emacs-minimal))) + ("emacs" ,emacs-minimal) + ("python" ,python))) (synopsis "GNU Emacs client for the Telegram messenger") (description "Telega is full-featured, unofficial client for the Telegram messaging -- 2.24.0 From patchwork Mon Dec 2 21:35:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 16348 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 315EB177FF; Mon, 2 Dec 2019 21:35:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E8C12177ED for ; Mon, 2 Dec 2019 21:35:13 +0000 (GMT) Received: from localhost ([::1]:44802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLd-0003J7-G4 for patchwork@mira.cbaines.net; Mon, 02 Dec 2019 16:35:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41109) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibtLW-0003H2-G8 for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibtLU-0005og-8z for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33087) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibtLS-0005nY-9t for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibtLS-00018g-7B for guix-patches@gnu.org; Mon, 02 Dec 2019 16:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 2/2] gnu: emacs-telega: Update to 0.4.4-2 References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2019 21:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.15753225004361 (code B ref 38463); Mon, 02 Dec 2019 21:35:02 +0000 Received: (at 38463) by debbugs.gnu.org; 2 Dec 2019 21:35:00 +0000 Received: from localhost ([127.0.0.1]:39059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLQ-00018G-7p for submit@debbugs.gnu.org; Mon, 02 Dec 2019 16:35:00 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibtLO-000181-C3 for 38463@debbugs.gnu.org; Mon, 02 Dec 2019 16:34:58 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AECB52400FF for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575322492; bh=cKmsSnkPMuvloN2uiogBHEkYJw8ziajdQon655/mgMk=; h=From:To:Subject:Date:From; b=HzKrZ3D91K/6cG+6K1eJ24W4BcrUFCsLDJfWyb3D2Wp+kAupBD498cIL5vb7qNTH/ o27J+vG6Jl4f6ZW9tCOtm5JJOQfhzdehkEBQL+Bsw3rG6QstDoeQD/nklIGfFNIQbS KytvdE6l2yvGVfbs/iQbpREns1C/NaUc4NHelN7wiB65FrlWF/7tV2fSO/cBOucEPH neC+QZSJY0Vv79e7ZVdmuB3BJYg6pUjmx1WndAK5Xr3VHqWKO9D/0eXIshcBs5AmEk uCU2goUlu2jnJT4HnnlzbgDzoTSQjrEFuKWJnk2Zi8jEu/URwzjS2ngc3SKcAkq7ns 95kTXxWkOs1jw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47RdgH5c3kz9rxM for <38463@debbugs.gnu.org>; Mon, 2 Dec 2019 22:34:51 +0100 (CET) From: Brett Gilio Date: Mon, 02 Dec 2019 15:35:02 -0600 Message-ID: <87immyh0mx.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From 04e417466dcd7e1a39ce69d04b9afc60c41bd603 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 2 Dec 2019 15:28:39 -0600 Subject: [PATCH 2/2] gnu: emacs-telega: Update to 0.4.4-2 * gnu/packages/emacs-xyz.scm (emacs-telega): Bump the package to use a newer git revision, which includes additional client features. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad78209ebb..4fa5cafd8d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19956,8 +19956,8 @@ fish-completion. It can be used in both Eshell and M-x shell.") (license license:gpl3+)))) (define-public emacs-telega - (let ((commit "019e923f933370d75dbe0a8473a18eb66fe94c0e") - (revision "1") + (let ((commit "56aef884921d99e5170d5425dbe0fce645620511") + (revision "2") (version "0.4.4")) (package (name "emacs-telega") @@ -19970,7 +19970,7 @@ fish-completion. It can be used in both Eshell and M-x shell.") (commit commit))) (sha256 (base32 - "058814agkq8mp9ajpj8sz51rm9nigs2xpsdij05wjkxhfq30kqva")) + "0a8k3j20nz4xwswg9qp9xpaakk3q3ibiz8mkryk92zmrdmaah5mi")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- 2.24.0 From patchwork Thu Dec 5 13:50:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 16383 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 30DF717843; Thu, 5 Dec 2019 14:08:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E779F17838 for ; Thu, 5 Dec 2019 14:08:12 +0000 (GMT) Received: from localhost ([::1]:54872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icrng-0001qf-1H for patchwork@mira.cbaines.net; Thu, 05 Dec 2019 09:08:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53955) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icrY4-0003qw-IY for guix-patches@gnu.org; Thu, 05 Dec 2019 08:52:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icrY3-0005US-CW for guix-patches@gnu.org; Thu, 05 Dec 2019 08:52:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37398) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icrY2-0005R7-RI for guix-patches@gnu.org; Thu, 05 Dec 2019 08:52:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icrY2-00076Z-IX for guix-patches@gnu.org; Thu, 05 Dec 2019 08:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38463] [PATCH 3/3] gnu: emacs-telega: Properly install alists. References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Dec 2019 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38463@debbugs.gnu.org Received: via spool by 38463-submit@debbugs.gnu.org id=B38463.157555387327243 (code B ref 38463); Thu, 05 Dec 2019 13:52:02 +0000 Received: (at 38463) by debbugs.gnu.org; 5 Dec 2019 13:51:13 +0000 Received: from localhost ([127.0.0.1]:43371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icrXE-00075K-Mv for submit@debbugs.gnu.org; Thu, 05 Dec 2019 08:51:12 -0500 Received: from mout01.posteo.de ([185.67.36.65]:43119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icrXC-00074r-1V for 38463@debbugs.gnu.org; Thu, 05 Dec 2019 08:51:11 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 908FB160061 for <38463@debbugs.gnu.org>; Thu, 5 Dec 2019 14:51:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575553863; bh=9iZPwl6LQqYqY3yqCgd/InaqLBl/SbbipYaDQAsfROg=; h=From:To:Subject:Date:From; b=Wo9har1iEkQhZdrFrWrMQEI9g1YBwJ0AAGfbV927Yxfe81Hye7ntloXlpyiVvGjJJ jOhbSRJJnBt0syEZVipmyicEgVttGLhFizQSysjSFxK7FGDC4AY6E/mZf5X8T8cUyl 40cAeyhjdKuuJtVRNiXWmzj+O78sIzaMdClJybgc3fCFSbWCT4mgGm9fNQLTGOufZ2 l6K1qrDRkXEcQykBUxyNrEc+/GortJVCrE7XoYogP9B2lzMHL0R31b2/i59sOGJur8 ygyX/Lc5wIGVcXbAsTRdeXw7pUsNz3oKem2RoU3Qvtl4xFpg+VNK2qCa0enmTv+e0k ImLYa1WPl27IQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47THDk0rb2z6tmP for <38463@debbugs.gnu.org>; Thu, 5 Dec 2019 14:51:01 +0100 (CET) From: Brett Gilio Date: Thu, 05 Dec 2019 07:50:54 -0600 Message-ID: <877e3ax4n5.fsf@posteo.net> MIME-Version: 1.0 Content-Disposition: inline; filename=0003-gnu-emacs-telega-Properly-install-alists.patch Content-Description: [PATCH 3/3] gnu: emacs-telega: Properly install alists. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From 5b4430dce26b607cc0ebf443a33a3607a3b33eb1 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 5 Dec 2019 07:48:30 -0600 Subject: [PATCH 3/3] gnu: emacs-telega: Properly install alists. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Telega has an etc directory that needs to be installed to emacs site-lisp dir. This patch adds that functionality. --- gnu/packages/emacs-xyz.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60d27ca3de..d5110e96da 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20019,11 +20019,23 @@ fish-completion. It can be used in both Eshell and M-x shell.") ;; Build emacs-side using `emacs-build-system' (add-after 'compress-documentation 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - (add-after 'emacs-set-emacs-load-path 'emacs-install + (add-after 'emacs-add-source-to-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-build + ;; This step adds subdir /etc to the site-lisp dir + ;; which is needed for images, notification sounds, + ;; and various alists. + ;; TODO: Replace with `#:include' method used by + ;; emacs-build-system. + (add-after 'emacs-install 'emacs-install-etc + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "." + (invoke "cp" "-r" "etc/" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/"))) + #t)) + (add-after 'emacs-install-etc 'emacs-build (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-install 'emacs-make-autoloads + (add-after 'emacs-build 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column))) -- 2.24.0