From patchwork Tue Apr 12 21:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_Mei=C3=9Fner?= X-Patchwork-Id: 38549 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 33FBC27BBEC; Tue, 12 Apr 2022 22:53:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A1AD27BBEB for ; Tue, 12 Apr 2022 22:53:11 +0100 (BST) Received: from localhost ([::1]:44680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neORi-00070f-EX for patchwork@mira.cbaines.net; Tue, 12 Apr 2022 17:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neORa-0006zr-C8 for guix-patches@gnu.org; Tue, 12 Apr 2022 17:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neORa-0004No-33 for guix-patches@gnu.org; Tue, 12 Apr 2022 17:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1neORa-0003rH-2Y for guix-patches@gnu.org; Tue, 12 Apr 2022 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54895] [PATCH 2/2] gnu: cava: Fix build failure Resent-From: Daniel =?utf-8?q?Mei=C3=9Fner?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Apr 2022 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54895@debbugs.gnu.org Cc: Daniel =?utf-8?q?Mei=C3=9Fner?= Received: via spool by 54895-submit@debbugs.gnu.org id=B54895.164980034614774 (code B ref 54895); Tue, 12 Apr 2022 21:53:02 +0000 Received: (at 54895) by debbugs.gnu.org; 12 Apr 2022 21:52:26 +0000 Received: from localhost ([127.0.0.1]:50411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neOQz-0003qC-Lv for submit@debbugs.gnu.org; Tue, 12 Apr 2022 17:52:26 -0400 Received: from out2.mail.ruhr-uni-bochum.de ([134.147.42.229]:10160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neOQv-0003pi-8W for 54895@debbugs.gnu.org; Tue, 12 Apr 2022 17:52:24 -0400 Received: from mx2.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by out2.mail.ruhr-uni-bochum.de (Postfix mo-ext) with ESMTP id 4KdKFW2Xlxz8Sq0 for <54895@debbugs.gnu.org>; Tue, 12 Apr 2022 23:52:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ruhr-uni-bochum.de; s=mail-2017; t=1649800335; bh=4nBIlf6jKfGgynuy2xx30J9n/gydA76K3XOL7Ge2TU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hvfvvNSlznhqObXaADg7CowBuEpXtwIgebNqkkJ/o2wO5D4k2Cb9AJrw2MJP7MzGA SH80PKTQxe1dXmj51XJq4hLhFIlvETzW6oEYHk71iEEmK+aKWiGrX7+bs7XggBcPmK Xmd6lsB3VW/O8YGhfZcq24RJOjHqXGCLeWLVdLeo= Received: from out2.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by mx2.mail.ruhr-uni-bochum.de (Postfix idis) with ESMTP id 4KdKFW1dn1z8Spc; Tue, 12 Apr 2022 23:52:15 +0200 (CEST) X-RUB-Notes: Internal origin=134.147.42.236 X-Envelope-Sender: Received: from mail2.mail.ruhr-uni-bochum.de (mail2.mail.ruhr-uni-bochum.de [134.147.42.236]) by out2.mail.ruhr-uni-bochum.de (Postfix mi-int) with ESMTP id 4KdKFW0MgWz8SgT; Tue, 12 Apr 2022 23:52:14 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mx2.mail.ruhr-uni-bochum.de Received: from think.local (dslb-002-204-219-156.002.204.pools.vodafone-ip.de [2.204.219.156]) by mail2.mail.ruhr-uni-bochum.de (Postfix) with ESMTPSA id 4KdKFV4dCZzDgyN; Tue, 12 Apr 2022 23:52:14 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.2 at mail2.mail.ruhr-uni-bochum.de Date: Tue, 12 Apr 2022 23:52:04 +0200 Message-Id: <20220412215204.15514-2-daniel.meissner-i4k@ruhr-uni-bochum.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412215204.15514-1-daniel.meissner-i4k@ruhr-uni-bochum.de> References: <20220412215204.15514-1-daniel.meissner-i4k@ruhr-uni-bochum.de> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Daniel =?utf-8?q?Mei=C3=9Fner?= X-ACL-Warn: , =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= via From: =?utf-8?q?Daniel_Mei=C3=9Fner?= X-getmail-retrieved-from-mailbox: Patches * 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