guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/07: gnu: cava: Fix build failure


From: guix-commits
Subject: 07/07: gnu: cava: Fix build failure
Date: Fri, 6 May 2022 04:33:00 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 27fc4ae397f068fc21943e86315a71b42305f730
Author: Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
AuthorDate: Tue Apr 12 23:52:04 2022 +0200

    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>
---
 gnu/packages/audio.scm | 15 ++++++++++++---
 1 file 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]