diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2019-06-08 13:56:47 +0200 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2019-06-08 14:00:22 +0200 |
| commit | dacc02faa541741c5ed11f6403ebf3fef0a54a32 (patch) | |
| tree | db0ac1f043e1befe8c01056e1f8b1202c9875228 /pkgs/servers/pulseaudio | |
| parent | ed136f84efd327f599d3e24b9ff56d9784ab9e2f (diff) | |
| download | nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar.gz nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar.bz2 nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar.lz nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar.xz nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.tar.zst nixlib-dacc02faa541741c5ed11f6403ebf3fef0a54a32.zip | |
pulseaudio: Fix detection of ALSA UCM
This one was a bit tricky to find because it only causes a runtime
error, and pulseaudio has shims for most ALSA UCM methods except one.
(I guess nobody ever really tests pulseaudio in combination with
UCM-less ALSA?)
ALSA 1.1.8 had ${alsa-dev}/include/alsa/ in the pkg-config file, which
was considered wrong and fixed in 1.1.9.
However, pulseaudio was relying on being able to include ALSA headers
like <asoundlib.h> and <use-case.h> rather than <alsa/asoundlib.h> and
<alsa/use-case.h>. (For asoundlib.h it only causes a warning, because
the ALSA guys created a shim for that header.)
These two patches change pulseaudio to use the correct include
directives.
Diffstat (limited to 'pkgs/servers/pulseaudio')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index a913643df081..06693303ff92 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , libsndfile, libtool, makeWrapper , xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus @@ -117,6 +117,19 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" ''; + patches = [ + (fetchpatch { + name = "alsa-asoundlib-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch"; + sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71"; + }) + (fetchpatch { + name = "alsa-use-case-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch"; + sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb"; + }) + ]; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; |