ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacspeak: Update to 48.0.

Browse source 
* gnu/packages/emacs.scm (emacspeak): Update to 48.0.
[arguments]: Use 'invoke'.  In the 'install' phase, add additional
installation directories and fix the launch script substitution.
[inputs]: Add emacs and perl.
[native-inputs]: Remove emacs-minimal.
This commit is contained in:
Kei Kebreau 2018-06-13 14:34:31 -04:00
parent 8c655f31db
commit 935cb931b5
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/emacs.scm
View file

@ -5636,7 +5636,7 @@ (define-public emacs-highlight-stages
(define-public emacspeak (define-public emacspeak
(package (package
(name "emacspeak") (name "emacspeak")
(version "47.0") (version "48.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5645,7 +5645,7 @@ (define-public emacspeak
version "/emacspeak-" version ".tar.bz2")) version "/emacspeak-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0xbcc266x752y68s3g096m161irzvsqym3axzqn8rb276a8x55n7")))) "07imi3hji06b3r7v7v59978q76s8a7ynmxwfc9j03pgnv965lpjy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "prefix=" '(#:make-flags (list (string-append "prefix="
@ -5653,30 +5653,35 @@ (define-public emacspeak
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
;; Configure Emacspeak according to etc/install.org. (let* ((out (assoc-ref outputs "out"))
(setenv "SHELL" (which "sh")) (lisp (string-append out
(zero? (system* "make" "config")))) "/share/emacs/site-lisp/emacspeak")))
(setenv "SHELL" (which "sh"))
;; Configure Emacspeak according to etc/install.org.
(invoke "make" "config"))))
(add-after 'build 'build-espeak (add-after 'build 'build-espeak
(lambda _ (lambda _
(zero? (system* "make" "espeak")))) (invoke "make" "espeak")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(lisp (string-append out "/share/emacs/site-lisp/emacspeak")) (lisp (string-append out "/share/emacs/site-lisp/emacspeak"))
(info (string-append out "/share/info"))) (info (string-append out "/share/info"))
(emacs (string-append (assoc-ref inputs "emacs")
"/bin/emacs")))
;; According to etc/install.org, the Emacspeak directory should ;; According to etc/install.org, the Emacspeak directory should
;; be copied to its installation destination. ;; be copied to its installation destination.
(for-each (for-each
(lambda (file) (lambda (file)
(copy-recursively file (string-append lisp "/" file))) (copy-recursively file (string-append lisp "/" file)))
'("etc" "info" "lisp" "media" "servers" "sounds" "stumpwm" '("etc" "info" "js" "lisp" "media" "scapes" "servers" "sounds"
"xsl")) "stumpwm" "xsl"))
;; Make sure emacspeak is loaded from the correct directory. ;; Make sure emacspeak is loaded from the correct directory.
(substitute* "etc/emacspeak.sh" (substitute* "etc/emacspeak.sh"
(("exec emacs.*$") (("exec FLAVOR.*")
(string-append "exec emacs -l " lisp (string-append "exec " emacs " -l " lisp
"/lisp/emacspeak-setup.el $CL_ALL"))) "/lisp/emacspeak-setup.el $CL_ALL")))
;; Install the convenient startup script. ;; Install the convenient startup script.
(mkdir-p bin) (mkdir-p bin)
@ -5695,10 +5700,11 @@ (define-public emacspeak
#t)))) #t))))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(inputs (inputs
`(("espeak" ,espeak) `(("emacs" ,emacs)
("espeak" ,espeak)
("perl" ,perl)
("tcl" ,tcl) ("tcl" ,tcl)
("tclx" ,tclx))) ("tclx" ,tclx)))
(native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://emacspeak.sourceforge.net") (home-page "http://emacspeak.sourceforge.net")
(synopsis "Audio desktop interface for Emacs") (synopsis "Audio desktop interface for Emacs")
(description (description