From 30a31004b1d86c9b4a0c20a435202ca53e991972 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Mon, 6 Sep 2021 18:56:18 +0800 Subject: [PATCH] gnu: emacs-telega: Install etc directory to better path. * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Add the #:include argument. Remove install-share-files phase. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bb0470516..9af60a8c5f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26718,6 +26718,7 @@ (define-public emacs-telega emacs-minimal ;; Require wide-int support for 32-bit platform. emacs-wide-int) + #:include (cons "^etc\\/" %default-include) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -26745,24 +26746,8 @@ (define-public emacs-telega "/bin/telega-server"))) (substitute* "telega-util.el" (("@TELEGA_SHARE@") - (string-append (assoc-ref outputs "out") - "/share/emacs-telega"))))) - (add-after 'install 'install-share-files - (lambda* (#:key outputs #:allow-other-keys) - (define install-plan - '("langs" "sounds" "emojis.alist" - "verified.svg" "telega-logo.svg")) - - (define prefix (string-append (assoc-ref outputs "out") - "/share/emacs-telega")) - (with-directory-excursion "etc" - (for-each (lambda (file) - (if (file-is-directory? file) - (let ((dest (string-append prefix "/" file))) - (copy-recursively file dest)) - (install-file file prefix))) - install-plan)) - #t))))) + (string-append (elpa-directory (assoc-ref outputs "out")) + "/etc")))))))) (inputs `(("emacs-telega-server" ,emacs-telega-server) ("ffmpeg" ,ffmpeg)))