summary refs log tree commit diff
path: root/pkgs/servers/pulseaudio
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-06-04 17:05:38 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2019-06-04 17:10:14 +0200
commitb4fa23991b46310979d667e1253eed2544f18f89 (patch)
treea1e4f1c52b297d82afc0b0228258d6596aff26da /pkgs/servers/pulseaudio
parentaceffe6f0c0c9fdadbb85b86cb0896b8ab7fcf4e (diff)
downloadnixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar.gz
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar.bz2
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar.lz
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar.xz
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.tar.zst
nixpkgs-b4fa23991b46310979d667e1253eed2544f18f89.zip
pulseaudio: fix alsa due to alsaLib headers move
The pulseaudio alsa module would fail to load due to missing symbols.
Diffstat (limited to 'pkgs/servers/pulseaudio')
-rw-r--r--pkgs/servers/pulseaudio/default.nix13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index a913643df08..0b3d9eb53ad 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -4,6 +4,7 @@
 , avahi, libjack2, libasyncns, lirc, dbus
 , sbc, bluez5, udev, openssl, fftwFloat
 , speexdsp, systemd, webrtc-audio-processing
+, fetchpatch
 
 , x11Support ? false
 
@@ -61,6 +62,18 @@ stdenv.mkDerivation rec {
       ++ lib.optional zeroconfSupport  avahi
     );
 
+    patches = [
+      # The following two patches fix alsalib headers move, remove after the next release
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch";
+        sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71";
+      })
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch";
+        sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb";
+      })
+    ];
+
   preConfigure = ''
     # Performs and autoreconf
     export NOCONFIGURE="yes"