From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icxKD-0001Oh-2Q for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icxKA-0004U2-Ia for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icxK6-0004RW-UC for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icxK6-0002dS-ST for guix-patches@gnu.org; Thu, 05 Dec 2019 15:02:02 -0500 Subject: [bug#38463] [PATCH 3/3] gnu: emacs-telega: Install telega-data to site-lisp. References: <87r21mh0pt.fsf@posteo.net> In-Reply-To: <87r21mh0pt.fsf@posteo.net> Resent-Message-ID: From: Brett Gilio Date: Thu, 05 Dec 2019 14:01:13 -0600 Message-ID: <87fthyzgmu.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38463@debbugs.gnu.org --=-=-= Content-Type: text/plain This patch is a reworked version of [PATCH 3/3] sent earlier in the list. Thanks to Leo Prikler who I have marked as a co-author for their help. Everything should be good to merge now! -- Brett M. Gilio https://git.sr.ht/~brettgilio/ --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-emacs-telega-Install-telega-data-to-site-lisp.patch Content-Description: [PATCH 3/3] gnu: emacs-telega: Install telega-data to site-lisp. >From 62ad3f8a8a62fddc4e83cdbc43d2701dcd476224 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 5 Dec 2019 13:51:14 -0600 Subject: [PATCH 3/3] gnu: emacs-telega: Install telega-data to site-lisp. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: This commit revises a previous patch and gives the source etc/ directory a unique installation pth in the site-lisp directory stucture. Co-authored-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60d27ca3de..1c0a5acc38 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19989,6 +19989,13 @@ fish-completion. It can be used in both Eshell and M-x shell.") (("python3 run_tests.py") "")) #t)) + ;; Modify telega-util to reflect unique dir name in + ;; `telega-install-data' phase. + (add-after 'unpack 'telega-data-patch + (lambda _ + (substitute* "telega-util.el" + (("etc/") "telega-data/")) + #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. @@ -20019,11 +20026,24 @@ 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 and + ;; gives it a unique name which is needed for images, + ;; notification sounds, and various alists. + ;; TODO: Replace with `#:include' method used by + ;; emacs-build-system. + (add-after 'emacs-install 'telega-install-data + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "." + (invoke "cp" "-r" "etc/" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/" + "telega-data/"))) + #t)) + (add-after 'telega-install-data '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 --=-=-=--