diff mbox series

[bug#54895,2/2] gnu: cava: Fix build failure

Message ID 20220412215204.15514-2-daniel.meissner-i4k@ruhr-uni-bochum.de
State Accepted
Headers show
Series Fix failing build of cava | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Daniel Meißner April 12, 2022, 9:52 p.m. UTC 
* gnu/packages/audio.scm (cava)[source]: Remove bundled iniparser.
(cava)[inputs]: Add iniparser.
---
 gnu/packages/audio.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index fd85b20855..9b7d723921 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -110,6 +110,7 @@  (define-module (gnu packages audio)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages samba)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
@@ -4587,10 +4588,18 @@  (define-public cava
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))))
+                "1mziklmqifhnb4kg9ia2r56r8wjn6xp40bkpf484hsgqvnrccl86"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(begin
+                   (delete-file-recursively "iniparser")
+                   (substitute* "configure.ac"
+                     (("AC_CONFIG_FILES\\(iniparser/Makefile\\)") ""))
+                   (substitute* "Makefile.am"
+                     (("SUBDIRS = iniparser") ""))))))
     (build-system gnu-build-system)
     (native-inputs (list autoconf automake libtool))
-    (inputs (list fftw ncurses pulseaudio))
+    (inputs (list fftw ncurses pulseaudio iniparser))
     (arguments
      (list #:configure-flags
            #~(list (string-append "PREFIX="
@@ -4599,7 +4608,7 @@  (define-public cava
                                   #$output "/share/consolefonts"))
            #:make-flags
            #~(let ((lib (string-append #$output "/lib")))
-               (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
+               (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib " -lrt")))
            #:phases
            #~(modify-phases %standard-phases
                (replace 'bootstrap