summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>2022-04-12 23:52:04 +0200
committerLudovic Courtès <ludo@gnu.org>2022-05-06 10:32:06 +0200
commit27fc4ae397f068fc21943e86315a71b42305f730 (patch)
tree41b03b0ec8f90132056359a8ce335b568e10f722
parentde4e4506c1a6a52692358f2c7857a3ae14c8b30a (diff)
downloadguix-27fc4ae397f068fc21943e86315a71b42305f730.tar.gz
gnu: cava: Fix build failure
* gnu/packages/audio.scm (cava)[source]: Remove bundled iniparser.
(cava)[inputs]: Add iniparser.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/audio.scm15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 965651f2c4..c273b497f4 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -110,6 +110,7 @@
   #: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)
@@ -4632,10 +4633,18 @@ representations.")
               (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="
@@ -4644,7 +4653,7 @@ representations.")
                                   #$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