[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: emacs-tmr: Update arguments and license.
From: |
guix-commits |
Subject: |
02/04: gnu: emacs-tmr: Update arguments and license. |
Date: |
Sat, 29 Oct 2022 17:53:44 -0400 (EDT) |
ngz pushed a commit to branch master
in repository guix.
commit d231651696e5eb66895ca446f2e833ec6df4c571
Author: Aleksandr Vityazev <avityazev@posteo.org>
AuthorDate: Fri Oct 28 09:04:00 2022 +0000
gnu: emacs-tmr: Update arguments and license.
* gnu/packages/emacs-xyz.scm (emacs-trm): [arguments]:
Rename PATCH-FFPLAY phase to PATCH-PATHS and substitute
TMR-SOUND-FILE variable. Add MAKEINFO phase;
[inputs]: Add SOUND-THEME-FREEDESKTOP;
[license]: Add fdl1.3+;
[use-modules]: Add (gnu packages libcanberra).
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a10d65d151..3682a2bbe5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -245,6 +245,7 @@
#:use-module (gnu packages ocaml)
#:use-module (gnu packages erlang)
#:use-module (gnu packages statistics)
+ #:use-module (gnu packages libcanberra)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
@@ -14502,21 +14503,35 @@ structure, or any other pattern.")
(list
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'patch-ffplay
+ (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((ffplay (search-input-file inputs "/bin/ffplay")))
- (make-file-writable "tmr.el")
(substitute* "tmr.el"
- (("\"ffplay")
- (string-append "\"" ffplay)))))))))
+ (("\"ffplay ")
+ (string-append "\"" ffplay " "))))
+ (emacs-substitute-variables "tmr.el"
+ ("tmr-sound-file"
+ (search-input-file
+ inputs
+
"share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga")))))
+ (add-after 'install 'makeinfo
+ (lambda _
+ (invoke "emacs"
+ "--batch"
+ "--eval=(require 'ox-texinfo)"
+ "--eval=(find-file \"README.org\")"
+ "--eval=(org-texinfo-export-to-info)")
+ (install-file "tmr.info"
+ (string-append #$output "/share/info")))))))
(native-inputs (list texinfo))
- (inputs (list ffmpeg))
+ (inputs (list ffmpeg sound-theme-freedesktop))
(home-page "https://protesilaos.com/emacs/tmr/")
(synopsis "Set timers using a convenient notation")
(description
"TMR is an Emacs package that provides facilities for setting timers
using a convenient notation.")
- (license license:gpl3+)))
+ (license (list license:gpl3+
+ license:fdl1.3+)))) ;GFDLv1.3+ for the manual
(define-public emacs-gn-mode
(package