From 27fc4ae397f068fc21943e86315a71b42305f730 Mon Sep 17 00:00:00 2001 From: Daniel Meißner Date: Tue, 12 Apr 2022 23:52:04 +0200 Subject: gnu: cava: Fix build failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (cava)[source]: Remove bundled iniparser. (cava)[inputs]: Add iniparser. Signed-off-by: Ludovic Courtès --- 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 -- cgit v1.2.3