summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-03-20 22:44:26 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-03-20 22:44:26 +0100
commitbd0c62315b2ed400f3b58d457b5d2e4efb6ea138 (patch)
treeff405bff0fb76e73c36d0c8a4027de7a1aab30d5 /gnu
parent4e6509b27f584df4fb8a23366cc89af6cd9130b1 (diff)
downloadguix-bd0c62315b2ed400f3b58d457b5d2e4efb6ea138.tar.gz
gnu: bristol: Fix build failure with alsa-lib 1.1.x.
* gnu/packages/music.scm (bristol)[arguments]: Add build phase to fix build
failure with alsa-lib 1.1.x.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/music.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 87b6d5b9b3..5067ee8afa 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1236,6 +1236,13 @@ mixing, FFT scopes, MIDI automation and full scriptability in Scheme.")
                (substitute* "bristol/Makefile.in"
                  (("-msse -mfpmath=sse") "")))
              #t))
+         ;; alsa-lib 1.1.x no longer provides iatomic.h.  That's okay because
+         ;; bristol actually doesn't use it.
+         (add-after 'unpack 'do-not-use-alsa-iatomic
+           (lambda _
+             (substitute* "libbristolaudio/audioEngineJack.c"
+               (("#include <alsa/iatomic.h>") ""))
+             #t))
          ;; We know that Bristol has been linked with JACK and we don't have
          ;; ldd, so we can just skip this check.
          (add-after 'unpack 'do-not-grep-for-jack