me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-emms: Use new style.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-emms)[arguments]<#:phases>: Use
SEARCH-INPUT-FILE.  Remove trailing #T.
[inputs]: Remove labels.
This commit is contained in:
Nicolas Goaziou 2021-12-14 18:59:44 +01:00
parent 6aece4b94d
commit b1d7112f8e
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 33 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
gnu/packages/emacs-xyz.scm
View file

@ -2162,65 +2162,56 @@ light user interface.")
(add-after 'unpack 'set-external-programs (add-after 'unpack 'set-external-programs
;; Specify the absolute file names of the various programs ;; Specify the absolute file names of the various programs
;; so that everything works out-of-the-box. (tinytag missing) ;; so that everything works out-of-the-box. (tinytag missing)
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((amixer (search-input-file inputs "/bin/amixer"))
(emms-print-metadata (assoc-ref inputs "emms-print-metadata")) (emms-print-metadata
(flac (assoc-ref inputs "flac")) (search-input-file inputs "/bin/emms-print-metadata"))
(vorbis (assoc-ref inputs "vorbis-tools")) (exiftool (search-input-file inputs "/bin/exiftool"))
(alsa (assoc-ref inputs "alsa-utils")) (metaflac (search-input-file inputs "/bin/metaflac"))
(mpg321 (assoc-ref inputs "mpg321")) (mp3info (search-input-file inputs "/bin/mp3info"))
(mp3info (assoc-ref inputs "mp3info")) (mpg321 (search-input-file inputs "/bin/mpg321"))
(mutagen (assoc-ref inputs "mutagen")) (mid3v2 (search-input-file inputs "/bin/mid3v2"))
(exiftool (assoc-ref inputs "perl-image-exiftool")) (ogg123 (search-input-file inputs "/bin/ogg123"))
(opus (assoc-ref inputs "opus-tools"))) (ogginfo (search-input-file inputs "/bin/ogginfo"))
(opusinfo (search-input-file inputs "/bin/opusinfo"))
(vorbiscomment (search-input-file inputs "/bin/vorbiscomment")))
(emacs-substitute-variables "emms-player-mpg321-remote.el" (emacs-substitute-variables "emms-player-mpg321-remote.el"
("emms-player-mpg321-remote-command" ("emms-player-mpg321-remote-command"
(string-append mpg321 "/bin/mpg321"))) (string-append mpg321 "/bin/mpg321")))
(substitute* "emms-player-simple.el" (substitute* "emms-player-simple.el"
(("\"ogg123\"") (("\"ogg123\"") (string-append "\"" ogg123 "\"")))
(string-append "\"" vorbis "/bin/ogg123\"")))
(substitute* "emms-player-simple.el" (substitute* "emms-player-simple.el"
(("\"mpg321\"") (("\"mpg321\"") (string-append "\"" mpg321 "\"")))
(string-append "\"" mpg321 "/bin/mpg321\"")))
(emacs-substitute-variables "emms-info-ogginfo.el" (emacs-substitute-variables "emms-info-ogginfo.el"
("emms-info-ogginfo-program-name" ("emms-info-ogginfo-program-name" ogginfo))
(string-append vorbis "/bin/ogginfo")))
(emacs-substitute-variables "emms-info-opusinfo.el" (emacs-substitute-variables "emms-info-opusinfo.el"
("emms-info-opusinfo-program-name" ("emms-info-opusinfo-program-name" opusinfo))
(string-append opus "/bin/opusinfo")))
(emacs-substitute-variables "emms-info-libtag.el" (emacs-substitute-variables "emms-info-libtag.el"
("emms-info-libtag-program-name" ("emms-info-libtag-program-name" emms-print-metadata))
(string-append emms-print-metadata "/bin/emms-print-metadata")))
(emacs-substitute-variables "emms-info-mp3info.el" (emacs-substitute-variables "emms-info-mp3info.el"
("emms-info-mp3info-program-name" ("emms-info-mp3info-program-name" mp3info))
(string-append mp3info "/bin/mp3info")))
(emacs-substitute-variables "emms-info-metaflac.el" (emacs-substitute-variables "emms-info-metaflac.el"
("emms-info-metaflac-program-name" ("emms-info-metaflac-program-name" metaflac))
(string-append flac "/bin/metaflac")))
(emacs-substitute-variables "emms-source-file.el" (emacs-substitute-variables "emms-source-file.el"
("emms-source-file-gnu-find" (which "find"))) ("emms-source-file-gnu-find" (which "find")))
(substitute* "emms-volume-amixer.el" (substitute* "emms-volume-amixer.el"
(("\"amixer\"") (("\"amixer\"") (string-append "\"" amixer "\"")))
(string-append "\"" alsa "/bin/amixer\"")))
(substitute* "emms-tag-editor.el" (substitute* "emms-tag-editor.el"
(("\"mid3v2\"") (("\"mid3v2\"") (string-append "\"" mid3v2 "\""))
(string-append "\"" mutagen "/bin/mid3v2\""))
(("\"vorbiscomment\"") (("\"vorbiscomment\"")
(string-append "\"" vorbis "/bin/vorbiscomment\""))) (string-append "\"" vorbiscomment "\"")))
(substitute* "emms-info-exiftool.el" (substitute* "emms-info-exiftool.el"
(("\"exiftool\"") (("\"exiftool\"") (string-append "\"" exiftool "\"")))))))))
(string-append "\"" exiftool "/bin/exiftool\"")))
#t))))))
(inputs (inputs
`(("emms-print-metadata" ,emacs-emms-print-metadata) (list emacs-emms-print-metadata
("alsa-utils" ,alsa-utils) alsa-utils
("flac" ,flac) ;for metaflac flac ;for metaflac
("vorbis-tools" ,vorbis-tools) vorbis-tools
("mpg321" ,mpg321) mpg321
("mp3info" ,mp3info) mp3info
("mutagen" ,python-mutagen) python-mutagen
("perl-image-exiftool" ,perl-image-exiftool) perl-image-exiftool
("opus-tools" ,opus-tools))))) opus-tools))))
(define-public emacs-emms-mode-line-cycle (define-public emacs-emms-mode-line-cycle
(package (package