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

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit da72aff7b4c0ff816bbb941c3c622091fff2f603
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:06:44 2021 +0200

    gnu: music: Add 'bash' input for 'wrap-program'.
    
    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
---
 gnu/packages/music.scm | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ee131ffbc9..62746234a2 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -419,8 +419,7 @@ score, keyboard, guitar, drum and controller views.")
                    (find-files "3rdparty"
                                (lambda (file stat)
                                  (string-match "^3rdparty/[^/]*$" file))
-                               #:directories? #t))
-                  #t))))
+                               #:directories? #t))))))
     (build-system cmake-build-system)
     (arguments
      '(#:test-target "clementine_test"
@@ -442,15 +441,16 @@ score, keyboard, guitar, drum and controller views.")
              (let ((out             (assoc-ref outputs "out"))
                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
                (wrap-program (string-append out "/bin/clementine")
-                 `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
-               #t))))))
+                 `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
+                   (,gst-plugin-path)))))))))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("googletest" ,googletest)
-       ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
+     (list gettext-minimal
+           googletest
+           pkg-config
+           qttools-5))
     (inputs
-     (list boost
+     (list bash-minimal
+           boost
            chromaprint
            fftw
            glib
@@ -600,7 +600,8 @@ you create custom user interfaces for your MIDI hardware.")
              (setenv "DISPLAY" ":1")
              (setenv "HOME" (getcwd)))))))
     (native-inputs
-     (list gettext-minimal
+     (list bash-minimal
+           gettext-minimal
            googletest
            pkg-config
            qttools
@@ -2125,7 +2126,8 @@ for path in [path for path in sys.path if 'site-packages' 
in path]: site.addsite
                 (wrap-program (search-input-file outputs "bin/solfege")
                   `("GUIX_PYTHONPATH" ":" prefix (,path)))))))))
     (inputs
-     (list python-wrapper
+     (list bash-minimal
+           python-wrapper
            python-pygobject
            gettext-minimal
            gtk+
@@ -5727,7 +5729,7 @@ console music players.")
              go-github-com-wtolson-go-taglib
              go-github-com-yookoala-realpath))
       (inputs
-       (list chromaprint ffmpeg))
+       (list bash-minimal chromaprint ffmpeg))
       (arguments
        `(#:import-path "gitlab.com/ambrevar/demlo"
          #:phases
@@ -5743,8 +5745,7 @@ console music players.")
                      ,(map (lambda (dir)
                              (string-append dir "/bin:"
                                             dir "/sbin"))
-                           (list ffmpeg chromaprint))))
-                 #t)))
+                           (list ffmpeg chromaprint)))))))
            (add-after 'install 'install-scripts
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
@@ -5757,8 +5758,8 @@ console music players.")
                  (install-file (string-append root "/config.lua") 
xdg-data-dirs)
                  ;; TODO: Test fish completion.
                  (install-file (string-append root "/completion/demlo.fish")
-                               (string-append out 
"/share/fish/vendor_completions.d"))
-                 #t))))))
+                               (string-append
+                                out "/share/fish/vendor_completions.d"))))))))
       (home-page "https://gitlab.com/ambrevar/demlo";)
       (synopsis "Dynamic and extensible music library organizer")
       (description "Demlo is a music library organizer.  It can encode, fix
@@ -5823,6 +5824,7 @@ discard bad quality ones.
                          '("qtmultimedia"))))))))))
     (inputs
      (list alsa-lib
+           bash-minimal
            fftw
            jack-1
            portaudio
@@ -5855,7 +5857,8 @@ with error and volume history, and advanced features.")
     (native-inputs
      (list intltool pkg-config))
     (inputs
-     (list glib
+     (list bash-minimal
+           glib
            grilo
            gstreamer
            gst-plugins-base
@@ -5878,8 +5881,8 @@ with error and volume history, and advanced features.")
              (let ((out (assoc-ref outputs "out"))
                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
                (wrap-program (string-append out "/bin/pragha")
-                 `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
-               #t))))))
+                 `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
+                   (,gst-plugin-path)))))))))
     (home-page "https://pragha-music-player.github.io";)
     (synopsis "Music player")
     (description "Pragha is a lightweight music player based on Gtk and