From patchwork Tue Jul 6 18:36:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 31199 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 6035F27BC81; Tue, 6 Jul 2021 19:37:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1C4E927BC78 for ; Tue, 6 Jul 2021 19:37:09 +0100 (BST) Received: from localhost ([::1]:36536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0pwS-0007Gp-5Y for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 14:37:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0pwM-0007GK-Go for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0pwM-0000ut-8I for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0pwM-0001A3-7t for guix-patches@gnu.org; Tue, 06 Jul 2021 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49446] [PATCH 1/4] gnu: rtaudio: Fix include path. References: <20210706183240.134397-1-monego@posteo.net> In-Reply-To: <20210706183240.134397-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49446@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49446-submit@debbugs.gnu.org id=B49446.16255966194440 (code B ref 49446); Tue, 06 Jul 2021 18:37:02 +0000 Received: (at 49446) by debbugs.gnu.org; 6 Jul 2021 18:36:59 +0000 Received: from localhost ([127.0.0.1]:50162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwI-00019S-I8 for submit@debbugs.gnu.org; Tue, 06 Jul 2021 14:36:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0pwG-000198-IC for 49446@debbugs.gnu.org; Tue, 06 Jul 2021 14:36:57 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 22DEE2400FD for <49446@debbugs.gnu.org>; Tue, 6 Jul 2021 20:36:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625596610; bh=Wbn+y56VEPP2SADVVptcb0h56pxSZgAgGsHuG195Ek8=; h=From:To:Cc:Subject:Date:From; b=gOWGVLF2yyBADKgHweWKSGroUaLtXNO2NmTSiNOYqSDYsLkp4PAPYTNpYsa+In5x8 2lYQ1SghzMKc6peO6CqDMH6+xLhr4OQHukpC3nh2DGxdXrjeO5YDhhG1iK5vIUCoOv IiLl3VO2NrKUdZtMZJWd9JlnJ5yBRvQbMhzEse0Lb+6/tRkjbVK9Z19XRot59TJfJz kb3+pt9elVkRBxTywbNZr9HzRZ2YL7HS0/eAQsU5qdYz9RavMeVfqvaxCYMA2gEany /RUro8xw3DPGDk0U1mPhfDV3Kp3ueATxTGxxOEjj0Wdy5DTYaIvwVBO3esUiacrlIe sg3PszdbxCGcQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GKB9D4CvSz9rxQ; Tue, 6 Jul 2021 20:36:48 +0200 (CEST) From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:24 +0000 Message-Id: <20210706183627.134904-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (rtaudio)[arguments]: Add phase 'fix-inc-path to move the header to where pkg-config expects it. * gnu/packages/music.scm (muse-sequencer)[arguments]{#:phases}: Remove 'fix-include. Don't return #t. --- gnu/packages/audio.scm | 14 +++++++++++++- gnu/packages/music.scm | 7 +------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 791e821738..83e6cf860e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Jonathan Frederickson ;;; Copyright © 2020 Giacomo Leidi -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. @@ -2345,6 +2345,18 @@ implementation of the Open Sound Control (@dfn{OSC}) protocol.") (sha256 (base32 "156c2dgh6jrsyfn1y89nslvaxm4yifmxridsb708yvkaym02w2l8")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The header that pkg-config expects is include/rtaudio/RtAudio.h, + ;; but this package installs it as include/RtAudio.h by default. + (add-after 'install 'fix-inc-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include"))) + (mkdir-p (string-append inc "/rtaudio")) + (rename-file (string-append inc "/RtAudio.h") + (string-append inc "/rtaudio/RtAudio.h")))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5100ec8abe..28661c5667 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4841,12 +4841,7 @@ sample library.") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "src") #t)) - (add-after 'chdir 'fix-include - (lambda _ - (substitute* "muse/driver/rtaudio.h" - (("rtaudio/RtAudio.h") "RtAudio.h")) - #t))))) + (lambda _ (chdir "src")))))) (inputs `(("alsa-lib" ,alsa-lib) ("dssi" ,dssi)