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>
This commit is contained in:
		
							parent
							
								
									9ffeec668e
								
							
						
					
					
						commit
						d231651696
					
				
					 1 changed files with 21 additions and 6 deletions
				
			
		| 
						 | 
					@ -245,6 +245,7 @@
 | 
				
			||||||
  #:use-module (gnu packages ocaml)
 | 
					  #:use-module (gnu packages ocaml)
 | 
				
			||||||
  #:use-module (gnu packages erlang)
 | 
					  #:use-module (gnu packages erlang)
 | 
				
			||||||
  #:use-module (gnu packages statistics)
 | 
					  #:use-module (gnu packages statistics)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages libcanberra)
 | 
				
			||||||
  #:use-module (guix utils)
 | 
					  #:use-module (guix utils)
 | 
				
			||||||
  #:use-module (srfi srfi-1)
 | 
					  #:use-module (srfi srfi-1)
 | 
				
			||||||
  #:use-module (ice-9 match))
 | 
					  #:use-module (ice-9 match))
 | 
				
			||||||
| 
						 | 
					@ -14502,21 +14503,35 @@ structure, or any other pattern.")
 | 
				
			||||||
     (list
 | 
					     (list
 | 
				
			||||||
      #:phases
 | 
					      #:phases
 | 
				
			||||||
      #~(modify-phases %standard-phases
 | 
					      #~(modify-phases %standard-phases
 | 
				
			||||||
          (add-after 'unpack 'patch-ffplay
 | 
					          (add-after 'unpack 'patch-paths
 | 
				
			||||||
            (lambda* (#:key inputs #:allow-other-keys)
 | 
					            (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
              (let ((ffplay (search-input-file inputs "/bin/ffplay")))
 | 
					              (let ((ffplay (search-input-file inputs "/bin/ffplay")))
 | 
				
			||||||
                (make-file-writable "tmr.el")
 | 
					 | 
				
			||||||
                (substitute* "tmr.el"
 | 
					                (substitute* "tmr.el"
 | 
				
			||||||
                  (("\"ffplay")
 | 
					                  (("\"ffplay ")
 | 
				
			||||||
                   (string-append "\"" 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))
 | 
					    (native-inputs (list texinfo))
 | 
				
			||||||
    (inputs (list ffmpeg))
 | 
					    (inputs (list ffmpeg sound-theme-freedesktop))
 | 
				
			||||||
    (home-page "https://protesilaos.com/emacs/tmr/")
 | 
					    (home-page "https://protesilaos.com/emacs/tmr/")
 | 
				
			||||||
    (synopsis "Set timers using a convenient notation")
 | 
					    (synopsis "Set timers using a convenient notation")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "TMR is an Emacs package that provides facilities for setting timers
 | 
					     "TMR is an Emacs package that provides facilities for setting timers
 | 
				
			||||||
using a convenient notation.")
 | 
					using a convenient notation.")
 | 
				
			||||||
    (license license:gpl3+)))
 | 
					    (license (list license:gpl3+
 | 
				
			||||||
 | 
					                   license:fdl1.3+)))) ;GFDLv1.3+ for the manual
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public emacs-gn-mode
 | 
					(define-public emacs-gn-mode
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue