diff options
| author | Vinicius Monego <monego@posteo.net> | 2021-07-06 18:36:24 +0000 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-07-06 19:13:13 -0400 |
| commit | 177ff0775b510eca2bdccac84d67edc351fca59e (patch) | |
| tree | 21e6c1f41b682d7d99bc8615c5730bd1739b4b94 | |
| parent | ffc04f5cc6df16b5c10746ce7e4ef44fafc626e6 (diff) | |
| download | guix-177ff0775b510eca2bdccac84d67edc351fca59e.tar.gz guix-177ff0775b510eca2bdccac84d67edc351fca59e.zip | |
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 <leo@famulari.name>
| -rw-r--r-- | gnu/packages/audio.scm | 14 | ||||
| -rw-r--r-- | 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 <glv@posteo.net> ;;; Copyright © 2020 Jonathan Frederickson <jonathan@terracrypt.net> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> -;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; ;;; 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) |