From: "Daniel Meißner via Guix-patches via" <guix-patches@gnu.org>
To: 54895@debbugs.gnu.org
Cc: "Daniel Meißner" <daniel.meissner-i4k@ruhr-uni-bochum.de>
Subject: [bug#54895] [PATCH 2/2] gnu: cava: Fix build failure
Date: Tue, 12 Apr 2022 23:52:04 +0200 [thread overview]
Message-ID: <20220412215204.15514-2-daniel.meissner-i4k@ruhr-uni-bochum.de> (raw)
In-Reply-To: <20220412215204.15514-1-daniel.meissner-i4k@ruhr-uni-bochum.de>
* 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 --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
--
2.34.0
next prev parent reply other threads:[~2022-04-12 21:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 21:50 [bug#54895] [PATCH 0/2] Fix failing build of cava Daniel Meißner via Guix-patches via
2022-04-12 21:52 ` [bug#54895] [PATCH 1/2] gnu: cava: Use G-expressions Daniel Meißner via Guix-patches via
2022-04-12 21:52 ` Daniel Meißner via Guix-patches via [this message]
2022-05-06 8:31 ` bug#54895: [PATCH 0/2] Fix failing build of cava Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220412215204.15514-2-daniel.meissner-i4k@ruhr-uni-bochum.de \
--to=guix-patches@gnu.org \
--cc=54895@debbugs.gnu.org \
--cc=daniel.meissner-i4k@ruhr-uni-bochum.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.