summary refs log tree commit diff
diff options
context:
space:
mode:
authorZ572 <873216071@qq.com>2021-09-06 18:56:18 +0800
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2021-09-13 22:27:24 +0200
commit30a31004b1d86c9b4a0c20a435202ca53e991972 (patch)
tree4a93023e96d95dd94902120953cb0feca54c2d4b
parent1ada5e28ba695825d6287b6ac6a69f016777eb40 (diff)
downloadguix-30a31004b1d86c9b4a0c20a435202ca53e991972.tar.gz
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 <mail@nicolasgoaziou.fr>
-rw-r--r--gnu/packages/emacs-xyz.scm21
1 files 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 @@ service, and connect it with Emacs via inter-process communication.")
                     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 @@ service, and connect it with Emacs via inter-process communication.")
                                "/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)))