From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: From: Brett Gilio Date: Thu, 05 Dec 2019 07:50:54 -0600 Message-ID: <877e3ax4n5.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-emacs-telega-Properly-install-alists.patch Content-Description: [PATCH 3/3] gnu: emacs-telega: Properly install alists. 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 >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