From 177ff0775b510eca2bdccac84d67edc351fca59e Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 6 Jul 2021 18:36:24 +0000 Subject: [PATCH] gnu: rtaudio: Fix include path. * 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. Signed-off-by: Leo Famulari --- 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 7d7fb2b988..3939d4bc7e 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 @@ (define-public rtaudio (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 @@ (define-public muse-sequencer #: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)