ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: music: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/music.scm
(clementine): Remove trailing #t, input labels.
[inputs]: Add 'bash-minimal'.
(strawberry)[inputs]: Likewise.
(solfege)[inputs]: Likewise.
(demlo)[inputs]: Likewise.
(fmit)[inputs]: Likewise.
(pragha)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I73ceb7c22d20328412a01e88ac8c35c77168d9c3
This commit is contained in:
Maxime Devos 2021-07-02 12:06:44 +02:00 committed by Ludovic Courtès
parent b5e03030b0
commit b010c8f1eb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/music.scm
View file

@ -525,8 +525,7 @@ (define-public clementine
(find-files "3rdparty" (find-files "3rdparty"
(lambda (file stat) (lambda (file stat)
(string-match "^3rdparty/[^/]*$" file)) (string-match "^3rdparty/[^/]*$" file))
#:directories? #t)) #:directories? #t))))))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:test-target "clementine_test" '(#:test-target "clementine_test"
@ -548,15 +547,16 @@ (define-public clementine
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/clementine") (wrap-program (string-append out "/bin/clementine")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
#t)))))) (,gst-plugin-path)))))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("googletest" ,googletest) googletest
("pkg-config" ,pkg-config) pkg-config
("qtlinguist" ,qttools-5))) qttools-5))
(inputs (inputs
(list boost (list bash-minimal
boost
chromaprint chromaprint
fftw fftw
glib glib
@ -776,7 +776,8 @@ (define-public strawberry
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd))))))) (setenv "HOME" (getcwd)))))))
(native-inputs (native-inputs
(list gettext-minimal (list bash-minimal
gettext-minimal
googletest googletest
pkg-config pkg-config
qttools qttools
@ -2286,7 +2287,8 @@ (define-public solfege
(wrap-program (search-input-file outputs "bin/solfege") (wrap-program (search-input-file outputs "bin/solfege")
`("GUIX_PYTHONPATH" ":" prefix (,path))))))))) `("GUIX_PYTHONPATH" ":" prefix (,path)))))))))
(inputs (inputs
(list python-wrapper (list bash-minimal
python-wrapper
python-pygobject python-pygobject
gettext-minimal gettext-minimal
gtk+ gtk+
@ -6133,7 +6135,7 @@ (define-public demlo
go-github-com-wtolson-go-taglib go-github-com-wtolson-go-taglib
go-github-com-yookoala-realpath)) go-github-com-yookoala-realpath))
(inputs (inputs
(list chromaprint ffmpeg)) (list bash-minimal chromaprint ffmpeg))
(arguments (arguments
`(#:go ,go-1.17 `(#:go ,go-1.17
#:import-path "gitlab.com/ambrevar/demlo" #:import-path "gitlab.com/ambrevar/demlo"
@ -6150,8 +6152,7 @@ (define-public demlo
,(map (lambda (dir) ,(map (lambda (dir)
(string-append dir "/bin:" (string-append dir "/bin:"
dir "/sbin")) dir "/sbin"))
(list ffmpeg chromaprint)))) (list ffmpeg chromaprint)))))))
#t)))
(add-after 'install 'install-scripts (add-after 'install 'install-scripts
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -6164,8 +6165,8 @@ (define-public demlo
(install-file (string-append root "/config.lua") xdg-data-dirs) (install-file (string-append root "/config.lua") xdg-data-dirs)
;; TODO: Test fish completion. ;; TODO: Test fish completion.
(install-file (string-append root "/completion/demlo.fish") (install-file (string-append root "/completion/demlo.fish")
(string-append out "/share/fish/vendor_completions.d")) (string-append
#t)))))) out "/share/fish/vendor_completions.d"))))))))
(home-page "https://gitlab.com/ambrevar/demlo") (home-page "https://gitlab.com/ambrevar/demlo")
(synopsis "Dynamic and extensible music library organizer") (synopsis "Dynamic and extensible music library organizer")
(description "Demlo is a music library organizer. It can encode, fix (description "Demlo is a music library organizer. It can encode, fix
@ -6230,6 +6231,7 @@ (define-public fmit
'("qtmultimedia")))))))))) '("qtmultimedia"))))))))))
(inputs (inputs
(list alsa-lib (list alsa-lib
bash-minimal
fftw fftw
jack-1 jack-1
portaudio portaudio
@ -6262,7 +6264,8 @@ (define-public pragha
(native-inputs (native-inputs
(list intltool pkg-config)) (list intltool pkg-config))
(inputs (inputs
(list glib (list bash-minimal
glib
grilo grilo
gstreamer gstreamer
gst-plugins-base gst-plugins-base
@ -6285,8 +6288,8 @@ (define-public pragha
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/pragha") (wrap-program (string-append out "/bin/pragha")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
#t)))))) (,gst-plugin-path)))))))))
(home-page "https://pragha-music-player.github.io") (home-page "https://pragha-music-player.github.io")
(synopsis "Music player") (synopsis "Music player")
(description "Pragha is a lightweight music player based on Gtk and (description "Pragha is a lightweight music player based on Gtk and