diff options
author | Mark H Weaver <mhw@netris.org> | 2018-03-24 22:49:37 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-03-25 05:01:47 -0400 |
commit | d624eaaa3790a922480b4b47cde9740d7c7a0416 (patch) | |
tree | 31aed3c5b258abf632a3cbbb2456a44b852714b3 /gnu/packages/pulseaudio.scm | |
parent | fa6b87f1fc07b2245cf44f54b3b39dc62e9e4221 (diff) | |
download | guix-d624eaaa3790a922480b4b47cde9740d7c7a0416.tar guix-d624eaaa3790a922480b4b47cde9740d7c7a0416.tar.gz |
gnu: pulseaudio: Fix build with glibc-2.27.
* gnu/packages/patches/pulseaudio-glibc-2.27.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pulseaudio.scm (pulseaudio)[source]: Add the patch.
[arguments]: Replace 'bootstrap' phase.
[native-inputs]: Add autoconf, automake, and libtool.
Diffstat (limited to 'gnu/packages/pulseaudio.scm')
-rw-r--r-- | gnu/packages/pulseaudio.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index fee3c39043..bac92eafa9 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -141,6 +141,7 @@ rates.") (string-append "#" all "\n"))) #t)) (patches (search-patches + "pulseaudio-glibc-2.27.patch" "pulseaudio-fix-mult-test.patch" "pulseaudio-longer-test-timeout.patch")))) (build-system gnu-build-system) @@ -152,6 +153,13 @@ rates.") (assoc-ref %outputs "out") "/lib/udev/rules.d")) #:phases (modify-phases %standard-phases + (replace 'bootstrap + ;; TODO: Remove this custom bootstrap phase when + ;; pulseaudio-glibc-2.27.patch is removed. + (lambda _ + (patch-shebang "git-version-gen") + (setenv "NOCONFIGURE" "1") + (invoke "bash" "bootstrap.sh"))) (add-before 'check 'pre-check (lambda _ ;; 'tests/lock-autospawn-test.c' wants to create a file @@ -179,7 +187,12 @@ rates.") ("eudev" ,eudev) ;for the detection of hardware audio devices ("check" ,check))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; TODO: Remove "autoconf", "automake", and "libtool" from + ;; native-inputs when pulseaudio-glibc-2.27.patch is removed. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. `(("libcap" ,libcap) |