diff mbox series

[bug#50429] gnu: update emacs-telega-server and some change

Message ID tencent_46E952EDB2A8FE36740CCBE54A046A5B3609@qq.com
State Accepted
Headers show
Series [bug#50429] gnu: update emacs-telega-server and some change | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Z572 Sept. 6, 2021, 1:25 p.m. UTC

Comments

Nicolas Goaziou Sept. 13, 2021, 8:30 p.m. UTC | #1 
Hello,

All applied. Thank you.

Regards,
diff mbox series

Patch

From 51806ebddc0cc85a84017ed6537eee6ed6238760 Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Mon, 6 Sep 2021 18:56:18 +0800
Subject: [PATCH 3/3] 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.
---
 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 081e8cceab..2f5a0d46ee 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26657,6 +26657,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
@@ -26684,24 +26685,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)))
-- 
2.33.0